From 621fba8ad3ff6cf207fb01bb09eac654c903709f Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Feb 06 2020 16:52:05 +0000 Subject: Fix link failure with gcc 10 --- diff --git a/0001-Fix-link-failure-with-gcc-10.patch b/0001-Fix-link-failure-with-gcc-10.patch new file mode 100644 index 0000000..a0079a6 --- /dev/null +++ b/0001-Fix-link-failure-with-gcc-10.patch @@ -0,0 +1,28 @@ +From edcbe5f52ddfceee3d66d69bbcebbceac06b6d0d Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 4 Feb 2020 16:38:06 -0500 +Subject: [PATCH xf86-video-amdgpu] 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.23.0 + diff --git a/xorg-x11-drv-amdgpu.spec b/xorg-x11-drv-amdgpu.spec index e9ee9b4..ec3e41d 100644 --- a/xorg-x11-drv-amdgpu.spec +++ b/xorg-x11-drv-amdgpu.spec @@ -7,13 +7,14 @@ Name: xorg-x11-drv-amdgpu Version: 19.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: AMD GPU video driver License: MIT URL: https://www.x.org/wiki Source: https://www.x.org/archive/individual/driver/%{tarball}-%{version}.tar.bz2 +Patch0: 0001-Fix-link-failure-with-gcc-10.patch ExcludeArch: s390 s390x @@ -36,7 +37,7 @@ Requires: libdrm >= 2.4.76 X.Org X11 AMDGPU driver %prep -%autosetup -n %{tarball}-%{version} +%autosetup -p1 -n %{tarball}-%{version} %build #autoreconf -fiv @@ -55,6 +56,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_mandir}/man4/amdgpu.4* %changelog +* Thu Feb 06 2020 Adam Jackson - 19.1.0-3 +- Fix link failure with gcc 10 + * Fri Jan 31 2020 Fedora Release Engineering - 19.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild