summaryrefslogtreecommitdiff
path: root/x11-drivers/xf86-video-ati
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-05-14 11:09:11 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-05-14 11:09:11 +0100
commitdeba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree9a48f42594e1a9e6b2020d5535a784314434d7a7 /x11-drivers/xf86-video-ati
parent38423c67c8a23f6a1bc42038193182e2da3116eb (diff)
gentoo resync : 14.05.2020
Diffstat (limited to 'x11-drivers/xf86-video-ati')
-rw-r--r--x11-drivers/xf86-video-ati/Manifest3
-rw-r--r--x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-Fix-link-failure-with-gcc-10.patch33
-rw-r--r--x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0.ebuild4
3 files changed, 39 insertions, 1 deletions
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index eeab36261876..2bcc8ac9bef5 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,4 +1,5 @@
+AUX xf86-video-ati-19.1.0-Fix-link-failure-with-gcc-10.patch 991 BLAKE2B 30fab6591259a5fa2eeb917543b5ac91c632d9e21bb5271662f36619513582c26a8a4797e2b20491dbe1c384ca81098f3f5ef10ef4a673cc2442b0e4739dc47c SHA512 4022480caca968578ba62ac2a439b21f335b779e326df7d1838b3276e988dd3675bd225921beed08995f0a95df6989588bd673ab11828d0eb3a7132fc9271569
DIST xf86-video-ati-19.1.0.tar.bz2 904558 BLAKE2B 424e8b3c6fa14fa4f0bc00940bdf1008400f25ce7103b13ecefdbda9e629239c5ab011952d19c305251e9c0008650da3db0eb91055d5585e2b1c3dd108a74d86 SHA512 73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6
-EBUILD xf86-video-ati-19.1.0.ebuild 820 BLAKE2B 84c94dfd4759296f4eb1356be7d2350dd663f0dbab0d4b42dc30353f15504085fa184c9318b069c0f39550bab443085662caa816ec0aec68a2be47efa3762fd7 SHA512 b1c2e681582c29bce6c26dfcd252540e2a327005a4b4fcc3d98429e1071bf1348da3b33bca3c6dabeb8329878893287d40d228e4998dbd8b015a5c49d411bf5c
+EBUILD xf86-video-ati-19.1.0.ebuild 888 BLAKE2B 4383b8f9c59cbcc8d5b2fef483f4ed34a8cf09c0c1646ca990d22c99457260f1c85b274f443ca4507dbf9976cc1f68a5d5d1f3a087b0b4600997721b4feba72b SHA512 223cfc1ee3ca1ec45f6a3721469baf895cacad6a6d6b818f687f1a1713cc9498a80a3b77f9788334218db082b81518a882bf5687a3ff2755be0ea53aa4b0adba
EBUILD xf86-video-ati-9999.ebuild 825 BLAKE2B fb30e1c75777b7015345666745b0492bb846fcba2e38b8fe48393c12e046f73dace5564b8e80938cefa41e23c999e4627e3d1ec71cf14c3b8b0768275727643c SHA512 de56657f9c52de99c1e9e8dd2ef86a5588f66832d9048d1e573dcbacbfb69410f05f7372a545bd54c22cd5b541c7464351399153c7e25261ce68e1af73de6fe7
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
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 000000000000..e0375b0826c7
--- /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@redhat.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@redhat.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 f0b151ac4aca..5350c72cb741 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