Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/, games-emulation/mupen64plus-core/files/
Date: Wed, 26 Feb 2020 14:34:23
Message-Id: 1582727638.447ad3ceef7905cc45267886632da13f6a2bc8ed.soap@gentoo
1 commit: 447ad3ceef7905cc45267886632da13f6a2bc8ed
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 26 14:33:58 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 26 14:33:58 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=447ad3ce
7
8 games-emulation/mupen64plus-core: Fix GCC 10 / -fno-common
9
10 Closes: https://bugs.gentoo.org/708054
11 Package-Manager: Portage-2.3.89, Repoman-2.3.20
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 ...mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch | 20 ++++++++++++++++++++
15 .../mupen64plus-core/mupen64plus-core-2.5.9.ebuild | 2 ++
16 2 files changed, 22 insertions(+)
17
18 diff --git a/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch b/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch
19 new file mode 100644
20 index 00000000000..cfc7d5a9fb4
21 --- /dev/null
22 +++ b/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch
23 @@ -0,0 +1,20 @@
24 +--- a/src/device/r4300/idec.h
25 ++++ b/src/device/r4300/idec.h
26 +@@ -82,6 +82,6 @@
27 +
28 + #define IDEC_U53(r4300, iw, u53, u5) (void*)(((char*)(r4300)) + idec_u53((iw), (u53), (u5)))
29 +
30 +-const char* g_r4300_opcodes[R4300_OPCODES_COUNT];
31 ++extern const char* g_r4300_opcodes[R4300_OPCODES_COUNT];
32 +
33 + #endif
34 +--- a/src/main/workqueue.h
35 ++++ b/src/main/workqueue.h
36 +@@ -27,7 +27,6 @@
37 +
38 + struct work_struct;
39 +
40 +-struct work_struct *work;
41 + typedef void (*work_func_t)(struct work_struct *work);
42 + struct work_struct {
43 + work_func_t func;
44
45 diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
46 index f7e5603250c..5bf2f73d58f 100644
47 --- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
48 +++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
49 @@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
50 REQUIRED_USE="gles2? ( !osd )"
51 S=${WORKDIR}/${MY_P}
52
53 +PATCHES=( "${FILESDIR}"/${PN}-2.5.9-fix-gcc10-fno-common.patch )
54 +
55 src_prepare() {
56 default