aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-08-13 19:34:25 -0700
committerKhem Raj <raj.khem@gmail.com>2020-08-13 22:37:48 -0700
commite77bdb0e694a61aea116cd3ac2efc4521ad16e89 (patch)
tree5979a7dfeb310cd5afc35a03c508c9ae68f5c6d9
parent514a9e31ee03976e4280fac36038379d6ac50723 (diff)
downloadmeta-openembedded-contrib-e77bdb0e694a61aea116cd3ac2efc4521ad16e89.tar.gz
meta-openembedded-contrib-e77bdb0e694a61aea116cd3ac2efc4521ad16e89.tar.bz2
meta-openembedded-contrib-e77bdb0e694a61aea116cd3ac2efc4521ad16e89.zip
xf86-video-ati: Fix link failure with gcc 10
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch34
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb2
2 files changed, 36 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch
new file mode 100644
index 0000000000..7dfa233423
--- /dev/null
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch
@@ -0,0 +1,34 @@
+From cebbeaa9d0bdc18377faef27ea9ffd38e509d180 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.
+
+Upstream-Status: Backport [https://cgit.freedesktop.org/xorg/driver/xf86-video-ati/commit/?id=f223035f4ffcff2a9296d1e907a5193f8e8845a3]
+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 96eaef0..8cd8a0a 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.28.0
+
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb
index 4042150b1a..d3395496af 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb
@@ -12,6 +12,8 @@ DEPENDS += "virtual/libx11 libxvmc drm \
inherit features_check
REQUIRED_DISTRO_FEATURES += "opengl"
+SRC_URI += "file://0001-Fix-link-failure-with-gcc-10.patch"
+
SRC_URI[md5sum] = "47eccf71823206ade9629cba69de7ef6"
SRC_URI[sha256sum] = "5cb6015d8664546ad1311bc9c363d7bc41ebf60e7046ceb44dd38e5b707961b0"