summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-08-05 21:41:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-08 09:17:48 +0100
commit4a746979702a3e5b415c79ec24b5313dc88f7320 (patch)
tree9b1d082557029f16715bdefa14db3b5d89f0d169
parent12521660ecf5630b7cc52d5603d527ddf86627a0 (diff)
downloadpoky-4a746979702a3e5b415c79ec24b5313dc88f7320.tar.gz
xf86-video-intel: Fix build with -fno-common
(From OE-Core rev: 37faa5d2c441623f6e451c3a7ed2985840a2fc61) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-Avoid-duplicate-definition-of-I810PatternROP.patch27
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb1
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-Avoid-duplicate-definition-of-I810PatternROP.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-Avoid-duplicate-definition-of-I810PatternROP.patch
new file mode 100644
index 0000000000..765d9ec090
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-Avoid-duplicate-definition-of-I810PatternROP.patch
@@ -0,0 +1,27 @@
1From c2d730cf79eb3e4bea41f5ed8a8a21092ced8b03 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Hanno=20B=C3=B6ck?= <hanno@gentoo.org>
3Date: Sun, 2 Feb 2020 14:18:39 +0100
4Subject: [PATCH] i810: Avoid duplicate definition of I810PatternROP
5
6Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/commit/652d93cbbdc159c0883f1b626ea48e28bac63ae3]
7Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 src/legacy/i810/i810.h | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h
14index 347188c9..19be049c 100644
15--- a/src/legacy/i810/i810.h
16+++ b/src/legacy/i810/i810.h
17@@ -322,6 +322,6 @@ extern void I810InitMC(ScreenPtr pScreen);
18 extern const OptionInfoRec *I810AvailableOptions(int chipid, int busid);
19
20 extern const int I810CopyROP[16];
21-const int I810PatternROP[16];
22+extern const int I810PatternROP[16];
23
24 #endif /* _I810_H_ */
25--
262.28.0
27
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
index 7ab2236237..161371b118 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
@@ -15,6 +15,7 @@ S = "${WORKDIR}/git"
15 15
16SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \ 16SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \
17 file://0001-Sync-i915_pciids-upto-8717c6b7414f.patch \ 17 file://0001-Sync-i915_pciids-upto-8717c6b7414f.patch \
18 file://0001-i810-Avoid-duplicate-definition-of-I810PatternROP.patch \
18" 19"
19 20
20UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" 21UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"