summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2020-11-21 21:38:07 +0100
committerDavid Seifert <soap@gentoo.org>2020-11-21 21:38:07 +0100
commit5615d9ee802541a4d6d1e6ffe77dddc4550806ac (patch)
tree8eeb3b3cea8f0eb626c7e9eb48e6c01f044bc2a0
parentdev-games/t4k-common: Port to EAPI 7 (diff)
downloadgentoo-5615d9ee802541a4d6d1e6ffe77dddc4550806ac.tar.gz
gentoo-5615d9ee802541a4d6d1e6ffe77dddc4550806ac.tar.bz2
gentoo-5615d9ee802541a4d6d1e6ffe77dddc4550806ac.zip
games-emulation/advancemame: Add upstream patch for -fno-common
Closes: https://bugs.gentoo.org/706924 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--games-emulation/advancemame/advancemame-3.9.ebuild1
-rw-r--r--games-emulation/advancemame/files/advancemame-3.9-fno-common.patch33
2 files changed, 34 insertions, 0 deletions
diff --git a/games-emulation/advancemame/advancemame-3.9.ebuild b/games-emulation/advancemame/advancemame-3.9.ebuild
index 61a5a35b78d..2759ceac28f 100644
--- a/games-emulation/advancemame/advancemame-3.9.ebuild
+++ b/games-emulation/advancemame/advancemame-3.9.ebuild
@@ -43,6 +43,7 @@ PATCHES=(
"${FILESDIR}"/${P}-blank-flags.patch
"${FILESDIR}"/${P}-DESTDIR.patch
"${FILESDIR}"/${P}-FHS.patch
+ "${FILESDIR}"/${P}-fno-common.patch
)
src_prepare() {
diff --git a/games-emulation/advancemame/files/advancemame-3.9-fno-common.patch b/games-emulation/advancemame/files/advancemame-3.9-fno-common.patch
new file mode 100644
index 00000000000..c378b9aa919
--- /dev/null
+++ b/games-emulation/advancemame/files/advancemame-3.9-fno-common.patch
@@ -0,0 +1,33 @@
+From f8688cae05799a30cd5337e626a07fa9f004c0a3 Mon Sep 17 00:00:00 2001
+From: Andrea Mazzoleni <amadvance@gmail.com>
+Date: Fri, 23 Oct 2020 21:29:41 +0200
+Subject: [PATCH] Fix build errors due new gcc 10 default for -fno-common
+
+---
+ src/drivers/cavepgm.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/drivers/cavepgm.c b/src/drivers/cavepgm.c
+index 38d3dae8..df6e97ab 100644
+--- a/src/drivers/cavepgm.c
++++ b/src/drivers/cavepgm.c
+@@ -287,7 +287,7 @@ IGS PCB NO-0136 (Riser)
+ #include "timer.h"
+
+
+-UINT16 *pgm_mainram, *pgm_bg_videoram, *pgm_tx_videoram, *pgm_videoregs, *pgm_rowscrollram;
++extern UINT16 *pgm_mainram, *pgm_bg_videoram, *pgm_tx_videoram, *pgm_videoregs, *pgm_rowscrollram;
+ static UINT8 *z80_mainram;
+ static UINT32 *arm7_shareram;
+ static UINT32 arm7_latch;
+@@ -852,8 +852,8 @@ static void expand_32x32x5bpp(void)
+ /* This function expands the sprite colour data (in the A Roms) from 3 pixels
+ in each word to a byte per pixel making it easier to use */
+
+-UINT8 *pgm_sprite_a_region;
+-size_t pgm_sprite_a_region_allocate;
++extern UINT8 *pgm_sprite_a_region;
++extern size_t pgm_sprite_a_region_allocate;
+
+ static void expand_colourdata(void)
+ {