package/x11r7/xdriver-xf86-video-ati: Fix link failure with gcc 10
authorRomain Naour <romain.naour@gmail.com>
Sat, 3 Oct 2020 23:29:46 +0000 (01:29 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Sun, 4 Oct 2020 09:39:17 +0000 (11:39 +0200)
Backport an upstream patch.

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/x11r7/xdriver_xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch [new file with mode: 0644]

diff --git a/package/x11r7/xdriver_xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch b/package/x11r7/xdriver_xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch
new file mode 100644 (file)
index 0000000..b7a66c5
--- /dev/null
@@ -0,0 +1,35 @@
+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 xf86-video-ati] 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>
+[backport from upstream: f223035f4ffcff2a9296d1e907a5193f8e8845a3]
+Signed-off-by: Romain Naour <romain.naour@gmail.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.25.4
+