gentoo resync : 25.11.2020

3 files changed, 36 insertions, 1 deletions

diff --git a/games-emulation/advancemame/Manifest b/games-emulation/advancemame/Manifest
index 2093b4f94f25..e86ce8412b6e 100644
--- a/games-emulation/advancemame/Manifest
+++ b/games-emulation/advancemame/Manifest
@@ -1,9 +1,10 @@
 AUX advancemame-3.9-DESTDIR.patch 6316 BLAKE2B f2b2c08ac5ed2300c58575a9aece9371284aa731dfe63ac5ef86fc1609b24ee1e83d728d8e4d0566f570add7414bd9aa6b4eed2e06a999a79590606474f87d3d SHA512 2d13cd27eb145d6bdd59d8e1bff02b2a99676af343c2569038329716f05990959570141854bf68186ae9d5fbe4dea9da9a67cba1bca790c77264cf9a9530efa1
 AUX advancemame-3.9-FHS.patch 6693 BLAKE2B 44c58b984dee0e2db71a4192fcfc6b281242c12bc5f8edc1d27f2b167b306819ae64c9910a6ec6549691cfdba9f49615a0789618dd784e9b0c12091bba4ae185 SHA512 6d68288214a0a230e08405ae70564a0d144e47cd1a767ddbfd4b5898d2e178d3f8c3feb0020bc0eea1329c689ed603eacbe71f6bfe7f8ba2d3d3fc5badc74f7b
 AUX advancemame-3.9-blank-flags.patch 767 BLAKE2B 41601a7eec5ffff178f7da2448d01a7d3823c7ce800bafcbc33ea0a7f2a994e20d5fd3dd3f1eab77689c5965f173f5e432573ef6f04232001b69df141d60c9e5 SHA512 d622b0eb69f4653517c87a7caede4c8f1694efd8a103af360c06ebf704b9e98efe32176163361df73317714599033f004ce762973d475386c913465fea87047d
+AUX advancemame-3.9-fno-common.patch 1201 BLAKE2B fbf90d202dd2df6e1c16657452840d9c61e0100221c25fd1930e6a96572504e56425fe6c3428a0cbf2a70c3564f0f5e0fd9691b7c293365099c7b3c5b54ba58f SHA512 244c35e8bc9d6a325369f500c59d39dd660b43eb585f28a8a94a3d529326cb82b134a83eb1bab700afaeaa33260b4aa1db7543ba9257c490faae4627897ac016
 AUX advancemame-3.9-pkgconfig_for_ncurses_and_slang.patch 4630 BLAKE2B 0655e2c879211d5cc70636cc89fc71d73e79e3f50c468c53f879341a2d81a6087a88e9343dd2dd8044b69a347a02f4e7f6020641cdfa0f40d5a098bf4269f2bf SHA512 c2407adc532208444802c7cab50d0b6edb7e6a3b3e9da9818d891267fb9471524bda2df94cc1974e8c2fbb7b7329e76e313fdfc7b149a3aea264097d96ccf99c
 AUX advancemame-pic.patch 344 BLAKE2B 61e312fe33565171824e2e875a22187134bfc8905dfa2f6bc50b43427acd0f25502d1da1f7f591c1882e82f37d591c737af0aaaa98705c345637d786886e6c20 SHA512 5ae1a76a5e08e65efece7b295af7e177e8da7d65c7de9a03529d8a6909d38c6510d8c3e122bc4bc542760bc2cdf2e26a1edf56d27bcfa6b1fe25ea9c0f467360
 AUX advancemame-verboselog.patch 838 BLAKE2B 157d3797c5b92148d35f502fbc76aac9742c21b277d897308e4a074e1cba95b6fe1ea3e6b758be0a8d8b7e10fba5d33f5ac318d7c332f6bf622215627168646e SHA512 d34ff98ff2971a01dd46a66b322507afec4930f89afd2141e753233efeccdc582644dbf576eae08300c8e3be0336e09e56609983bcd602a69a47985ecd954e6e
 DIST advancemame-3.9.tar.gz 27287755 BLAKE2B 020a10a9b9fa207a733747273e749b4d9adabbd50104ae10b1568144bcdcb3694fe19e4ca5fd31119a02c64bca9872b1b3d1eb3ce305a611f006a8168f5bcb89 SHA512 43f9ba746f222b17ade2d213d6af7cc8fe6b3ee6008633f02b8877f4c7f75628bdf1cc9718db09f5f9a482d194c8ba94f9047334e8012d23c598454e5dab2eb3
-EBUILD advancemame-3.9.ebuild 1766 BLAKE2B 149fe1427b4a3d092be4034dea9ce4d5545f2643ec4a4f90426c4841bf73338e9700174ec19826734d364196b5d59c01cb81f936dd68b44a56f13012d84b51aa SHA512 d19c43726cd4adff7bee76c180279326791303bbb54972265cbb172fab3934fee5cde5005bd899e89b4fd534ff905029724ca80ccb30156577d33a784d9eaf8c
+EBUILD advancemame-3.9.ebuild 1803 BLAKE2B 9ac6e1b7bcfc3b83384d75e144d50d127759012a053e767ec2cd5faaba232ad449b2b58f68b74ba27add865659e2f0195a9c7ce3c6713877ab91174222770aa1 SHA512 0b8c30d8acab957baf56f6d00a024fd927dd12be48d2106bcfe502e371d3f3b9fe08432b4661722720494d9002adb7a309ced9385bff3f585819de5ddb3f6ddb
 MISC metadata.xml 1139 BLAKE2B 0722cccd2aa4d9e24eb990e460c91d8df503c1adffa680ac5e1f2b900bdfc93099feb06aab43b43ce27defc3183c6b75c594ce99e7f1396f5512babfc9de68d0 SHA512 a9a85b10cfbf6c7a75c317db8d242d29655d14d9891b897171161af613221fe93ad776ddb53fcddd14f08295d1e02c3c3fbccdce027e2a0d1c434fe60e49f349
diff --git a/games-emulation/advancemame/advancemame-3.9.ebuild b/games-emulation/advancemame/advancemame-3.9.ebuild
index 61a5a35b78d6..2759ceac28f3 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 000000000000..c378b9aa919e
--- /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)
+ {