summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2020-05-01 11:49:01 -0700
committerMatt Turner <mattst88@gentoo.org>2020-05-01 11:54:34 -0700
commit532a3eb3dda0ff59c4e3e80ff28b7856561fbee4 (patch)
treed2cb25b4cbb7107130bc605dde2581a510383be0 /x11-drivers
parentx11-drivers/xf86-video-ati: Add patch for GCC-10 (diff)
downloadgentoo-532a3eb3dda0ff59c4e3e80ff28b7856561fbee4.tar.gz
gentoo-532a3eb3dda0ff59c4e3e80ff28b7856561fbee4.tar.bz2
gentoo-532a3eb3dda0ff59c4e3e80ff28b7856561fbee4.zip
x11-drivers/xf86-video-amdgpu: Add patch for GCC-10
Closes: https://bugs.gentoo.org/719950 Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/xf86-video-amdgpu/files/xf86-video-amdgpu-19.1.0-Fix-link-failure-with-gcc-10.patch28
-rw-r--r--x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.1.0.ebuild4
2 files changed, 32 insertions, 0 deletions
diff --git a/x11-drivers/xf86-video-amdgpu/files/xf86-video-amdgpu-19.1.0-Fix-link-failure-with-gcc-10.patch b/x11-drivers/xf86-video-amdgpu/files/xf86-video-amdgpu-19.1.0-Fix-link-failure-with-gcc-10.patch
new file mode 100644
index 00000000000..cab3d1b11d1
--- /dev/null
+++ b/x11-drivers/xf86-video-amdgpu/files/xf86-video-amdgpu-19.1.0-Fix-link-failure-with-gcc-10.patch
@@ -0,0 +1,28 @@
+From edcbe5f52ddfceee3d66d69bbcebbceac06b6d0d Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 4 Feb 2020 16:38:06 -0500
+Subject: [PATCH] Fix link failure with gcc 10
+
+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.
+---
+ 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 803ac3c..9c0f25a 100644
+--- a/src/drmmode_display.h
++++ b/src/drmmode_display.h
+@@ -289,7 +289,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-amdgpu/xf86-video-amdgpu-19.1.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.1.0.ebuild
index d1d64a0c5d9..1c98f5bc557 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.1.0.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.1.0.ebuild
@@ -20,6 +20,10 @@ RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_amdgpu]
udev? ( virtual/libudev:= )"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}-Fix-link-failure-with-gcc-10.patch
+)
+
pkg_setup() {
XORG_CONFIGURE_OPTIONS=(
--enable-glamor