gentoo resync : 12.03.2021

3 files changed, 100 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-geode/Manifest b/x11-drivers/xf86-video-geode/Manifest
index 9908f45d3331..51010aa2badf 100644
--- a/x11-drivers/xf86-video-geode/Manifest
+++ b/x11-drivers/xf86-video-geode/Manifest
@@ -1,3 +1,4 @@
+AUX xf86-video-geode-2.11.20-fix-multiple-definition-of-linker-error.patch 2211 BLAKE2B ad3228a6c1d88f985949cd04940da5b3f45f2c284443c0bb538a44f75f8d479be1d64e8ed19a8953942c2ccb7996a55d6a490c1a1ab0f7f96bade79562dd16a5 SHA512 69d25f08a11c7897c7d870ae7f16977a55b7b678b0b3240d1626fe98638c7f76cfbb3f4d091436d4a984aeb3098e1635131c97be2025345bd18a90b82e3fb934
 DIST xf86-video-geode-2.11.20.tar.bz2 699973 BLAKE2B ed5c96a4ac41bb908239d89a49ef833a56fdeab62e441ddf36e32be1704a0850a2466a5538aafad87c83d3850339b0bdf0610851a17e3f4ace5eefab20c82296 SHA512 a67376ec174c544256aef693590d515742199c2acf1a54117207f599e1d9f70a3fb70c9c811ebc3f907dfa795e0e662a1c1f18673774660f0d5f3c757e848f0d
-EBUILD xf86-video-geode-2.11.20.ebuild 339 BLAKE2B 20041d5436b8f31697c59ba4ffe7c5c850a3144d57de09fe5df56c62cc864c32f8fe08f8b62e6e2b180af8af1e6d092db1733d174a28f7144940f10a94b442b0 SHA512 8dbc5582e5ea764eadcb8d66e75405117e478fae0d18168d9d9ff8b70a8fb424b0d5375eece2bb42e29bd5917251e9a6a32228ca916efb13585b93ceb7c28fcc
+EBUILD xf86-video-geode-2.11.20.ebuild 418 BLAKE2B df6745f4893cbb7aab1b266de5d5b8e835b8afc8fe23516859d0a846e988b6c6e2978717a2f00e8733faccffd6cb547fd04f9cba871de3c9eb60b9d052e4a041 SHA512 597ed5104afc1e14a22fe7899d317ddbf60d06b6b7c0c8b42747b79931bc290b87c24ade2ce779b0c171eff173f6f433c9288d972956f866fa520ca89a2b3c99
 MISC metadata.xml 373 BLAKE2B 1e2d777e05ee946958d8f757a6a710a04e299498cc195fbea7347b42545a91a028f765ed9c620ec5d6d233fc3fbe8e1c4a8d6a13441a8e4dc2ccef49490af27c SHA512 eb36f99f2f6df31d80d3ce66bb13b33d1c7eb7820b75f9bbfb2f4b7900bd2979c8ab9be59eb73742607f6c9d4ffec1ba489c15d239821fda9ff6e6a5f144ff65
diff --git a/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.20-fix-multiple-definition-of-linker-error.patch b/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.20-fix-multiple-definition-of-linker-error.patch
new file mode 100644
index 000000000000..5bacc0cfbc8d
--- /dev/null
+++ b/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.20-fix-multiple-definition-of-linker-error.patch
@@ -0,0 +1,93 @@
+From ba63bf6821c40707237ad2e7a13352a537e5b588 Mon Sep 17 00:00:00 2001
+From: Christian Gmeiner <christian.gmeiner@gmail.com>
+Date: Thu, 3 Dec 2020 14:22:23 +0100
+Subject: [PATCH] fix 'multiple definition of' linker error
+
+Fix for FTBFS due to -fno-common on GCC 10.
+
+Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
+---
+ src/geode.h     | 8 ++++----
+ src/gx_driver.c | 2 +-
+ src/gx_video.c  | 2 +-
+ src/lx_driver.c | 2 +-
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/geode.h b/src/geode.h
+index eb61c28..1b144ff 100644
+--- a/src/geode.h
++++ b/src/geode.h
+@@ -343,7 +343,7 @@ typedef struct _geodeRec {
+ 
+ /* option flags are self-explanatory */
+ #ifdef HAVE_LX
+-enum {
++enum LX_GeodeOpts {
+     LX_OPTION_SW_CURSOR,
+     LX_OPTION_HW_CURSOR,
+     LX_OPTION_NOCOMPRESSION,
+@@ -357,11 +357,11 @@ enum {
+     LX_OPTION_FBSIZE,
+     LX_OPTION_PANEL_MODE,
+     LX_OPTION_DONT_PROGRAM
+-} LX_GeodeOpts;
++};
+ #endif
+ 
+ #ifdef HAVE_GX
+-enum {
++enum GX_GeodeOpts {
+     GX_OPTION_SW_CURSOR,
+     GX_OPTION_HW_CURSOR,
+     GX_OPTION_NOCOMPRESSION,
+@@ -378,7 +378,7 @@ enum {
+     GX_OPTION_FBSIZE,
+     GX_OPTION_PANEL_GEOMETRY,
+     GX_OPTION_DONT_PROGRAM
+-} GX_GeodeOpts;
++};
+ #endif
+ 
+ /* geode_dcon.c */
+diff --git a/src/gx_driver.c b/src/gx_driver.c
+index 4de336e..188828c 100644
+--- a/src/gx_driver.c
++++ b/src/gx_driver.c
+@@ -78,7 +78,7 @@
+ 
+ extern OptionInfoRec GX_GeodeOptions[];
+ 
+-unsigned char *XpressROMPtr;
++extern unsigned char *XpressROMPtr;
+ 
+ static inline void
+ gx_enable_dac_power(void)
+diff --git a/src/gx_video.c b/src/gx_video.c
+index 0d3e1c5..7964d17 100644
+--- a/src/gx_video.c
++++ b/src/gx_video.c
+@@ -112,7 +112,7 @@ void GXSetVideoPosition(int x, int y, int width, int height,
+ 
+ extern void GXAccelSync(ScrnInfoPtr pScrni);
+ 
+-int DeltaX, DeltaY;
++extern int DeltaX, DeltaY;
+ 
+ unsigned long graphics_lut[256];
+ static int lutflag = 0;
+diff --git a/src/lx_driver.c b/src/lx_driver.c
+index 47f6875..9cb8889 100644
+--- a/src/lx_driver.c
++++ b/src/lx_driver.c
+@@ -74,7 +74,7 @@
+ 
+ extern OptionInfoRec LX_GeodeOptions[];
+ 
+-unsigned char *XpressROMPtr;
++extern unsigned char *XpressROMPtr;
+ 
+ static Bool
+ LXSaveScreen(ScreenPtr pScrn, int mode)
+-- 
+2.26.2
+
diff --git a/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.20.ebuild b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.20.ebuild
index 1f52580d981c..3b9f17e55879 100644
--- a/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.20.ebuild
+++ b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,10 @@ DEPEND="${RDEPEND}
 		sys-kernel/linux-headers
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-multiple-definition-of-linker-error.patch
+)
+
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ztv)