[gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-ati/files/, x11-drivers/xf86-video-ati/

[Matt Turner]

commit:     1089c0fa030301e8f4d29c04552ac1cbff1bd645
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May  1 18:48:58 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May  1 18:54:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1089c0fa

x11-drivers/xf86-video-ati: Add patch for GCC-10

Closes: https://bugs.gentoo.org/720266
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 ...o-ati-19.1.0-Fix-link-failure-with-gcc-10.patch | 33 ++++++++++++++++++++++
 .../xf86-video-ati/xf86-video-ati-19.1.0.ebuild    |  4 +++
 2 files changed, 37 insertions(+)

diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-Fix-link-failure-with-gcc-10.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-Fix-link-failure-with-gcc-10.patch
new file mode 100644
index 00000000000..e0375b0826c
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-Fix-link-failure-with-gcc-10.patch
@@ -0,0 +1,33 @@
+From f223035f4ffcff2a9296d1e907a5193f8e8845a3 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@××××××.com>
+Date: Tue, 4 Feb 2020 16:38:06 -0500
+Subject: [PATCH] Fix link failure with gcc 10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Without the 'extern' this looks like a definition not just a
+declaration, in every file that includes the header. gcc 10 is stricter
+about this kind of multiple definition.
+
+Reviewed-by: Michel Dänzer <mdaenzer@××××××.com>
+---
+ src/drmmode_display.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/drmmode_display.h b/src/drmmode_display.h
+index 96eaef0a..8cd8a0a6 100644
+--- a/src/drmmode_display.h
++++ b/src/drmmode_display.h
+@@ -262,7 +262,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crtc, drmVBlankSeqType type,
+ 			 uint64_t *ust, uint32_t *result_seq);
+ 
+ 
+-miPointerSpriteFuncRec drmmode_sprite_funcs;
++extern miPointerSpriteFuncRec drmmode_sprite_funcs;
+ 
+ 
+ #endif
+-- 
+2.26.2
+

diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0.ebuild
index f0b151ac4ac..5350c72cb74 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0.ebuild
@@ -24,6 +24,10 @@ RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_radeon]
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Fix-link-failure-with-gcc-10.patch
+)
+
 pkg_pretend() {
 	if use kernel_linux ; then
 		if kernel_is -ge 3 9; then