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

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

[Matt Turner]

commit:     532a3eb3dda0ff59c4e3e80ff28b7856561fbee4
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May  1 18:49:01 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=532a3eb3

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

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

 ...mdgpu-19.1.0-Fix-link-failure-with-gcc-10.patch | 28 ++++++++++++++++++++++
 .../xf86-video-amdgpu-19.1.0.ebuild                |  4 ++++
 2 files changed, 32 insertions(+)

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

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

[Matt Turner]

commit:     552aaa0867e47fc9a9a3bd5a65c2f97489e06883
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 07:45:42 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 07:46:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=552aaa08

x11-drivers/xf86-video-amdgpu: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-drivers/xf86-video-amdgpu/Manifest             |  1 -
 ...mdgpu-19.1.0-Fix-link-failure-with-gcc-10.patch | 28 ------------------
 .../xf86-video-amdgpu-19.1.0.ebuild                | 33 ----------------------
 3 files changed, 62 deletions(-)

diff --git a/x11-drivers/xf86-video-amdgpu/Manifest b/x11-drivers/xf86-video-amdgpu/Manifest
index 65e0f75d74aa..ca59467c0c11 100644
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@@ -1,2 +1 @@
-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

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
-}