gentoo resync : 05.12.2021

4 files changed, 2 insertions, 66 deletions

diff --git a/x11-drivers/xf86-video-amdgpu/Manifest b/x11-drivers/xf86-video-amdgpu/Manifest
index c87248ab5d7f..5b33cbbdcab5 100644
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@@ -1,7 +1,4 @@
-AUX xf86-video-amdgpu-19.1.0-Fix-link-failure-with-gcc-10.patch 848 BLAKE2B a4f7b14f2c3568ea3b0a1d568e8a144b8e7a1872b8723ba4d452df2c75e814eae3aa9cb336ad0c4a44639f10ea6cc66a9bce6d0ad33b730fd45f50f7d77b6df4 SHA512 1f4e580a11ddee24114a5f7692ec8331eafe57492f7f59461f8043132a2fc48d71adce2f7a831b6394804161689c13023711178c25fb34c2d299a9dada603fe4
-DIST xf86-video-amdgpu-19.1.0.tar.bz2 441746 BLAKE2B 75906c9b2200174711360e8cf095b8537e62618747afe5ec13f5a36ad8b61001b94e9df675df2026a61e66b6ea05e0e022640d487851d62ca4ed5ce61dd5aae7 SHA512 ccdaa2378492da1a2f3d18fedacd1318c4708da534a8a959276a82730d5420619d83ad1ec8d7835c55655fe56123cd9bffb44e6223c5a97033c01f598af4a173
 DIST xf86-video-amdgpu-21.0.0.tar.bz2 448400 BLAKE2B c7a90606b37b646b946f76d083b3d59755df331ffb7e83e4e65a821a8c0e556504b20207d6bb86e80ea98646184549b6388727df543e1e2cbab37600e243fa72 SHA512 44ccc8ddc36f09d1608cf58b6cf85dda090671c46c5643e9453f7d67f4d6850c3c9753eba43539d45773198b8042898a50153b5225780e4b2852410c5521314a
-EBUILD xf86-video-amdgpu-19.1.0.ebuild 629 BLAKE2B 1f93b25f75de10b7e3b71fd8d5a78370d6395978f5ef82695979ae9ff3ca6618c834e77acde34bffa6e92e30cb56267a8dc3a2045fbd4e1979c87084bd31d64a SHA512 fac323b81cc04858c3e000fecde83b660c20563bbfacf083f22dc56c7795a878e8aec03dd15928752bce19b5326480172fb89c4decf43350938f2376d7ce7fb6
-EBUILD xf86-video-amdgpu-21.0.0.ebuild 563 BLAKE2B 442e7b6efc5090b7b28f76f3fcd8cd38ed8244310c1d69f9089a0356c5b495121ae347417ecbb3e14269a49d6a08bdec72300c6fe3b19da7dfae0059263a8724 SHA512 8af569eba0ad63afe7fea572787dccbccc01387f32f83953640d3d2bc1b4eac70a8798529ae8e61d4c364af3f2868a85a7f1b51dbfbef084239f227b356fc643
+EBUILD xf86-video-amdgpu-21.0.0.ebuild 561 BLAKE2B 0525c53ecf1b2a7b3fe8d4e1823e50d390cdbde0b89df0c9267238a00dcfb515ba7c40dd34dbf5326de4fb4afe2aa886253208364788f0439538476e6ef902a0 SHA512 915f463eb31af478da19ed6dc8caa8d3d0d27de5ae517de3594a3ed575b71c4c02369f00aba21ffc63b3c95afeda9fd839866856562c4f6866d0531df66d8716
 EBUILD xf86-video-amdgpu-9999.ebuild 557 BLAKE2B 4acc38d1587451eb60056590aa5a6f578f2a3b190ebe77c76e7807ff9ac7280bc88e428a2b980d06c396d3c82fad76b869961cb33852a2156a39605f3f3d135f SHA512 6456b7b9c1ec69d93455a5ab260baaa83412474d0cb9ec904138fc9e31ab3f9455bbe2fcdac4ecf1d1653d1fefcf3389ed7f9779fb5d5c1c70906a97a4455b14
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
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
deleted file mode 100644
index cab3d1b11d12..000000000000
--- a/x11-drivers/xf86-video-amdgpu/files/xf86-video-amdgpu-19.1.0-Fix-link-failure-with-gcc-10.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index e784f9deaa06..000000000000
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-XORG_DRI="always"
-inherit xorg-3
-
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="amd64 ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
-
-IUSE="udev"
-
-RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_amdgpu]
-	x11-base/xorg-server[-minimal]
-	udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Fix-link-failure-with-gcc-10.patch
-)
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		--enable-glamor
-		$(use_enable udev)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild
index 8d9d0c8ed25b..9576e9abf56e 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="amd64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"