mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

xf86-video-intel: Fix build with -fno-common

Browse Source 
(From OE-Core rev: 37faa5d2c441623f6e451c3a7ed2985840a2fc61)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2020-08-05 21:41:54 -07:00
committed by Richard Purdie
parent 12521660ec
commit 4a74697970
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-Avoid-duplicate-definition-of-I810PatternROP.patch Normal file
View File

@@ -0,0 +1,27 @@
From c2d730cf79eb3e4bea41f5ed8a8a21092ced8b03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hanno=20B=C3=B6ck?= <hanno@gentoo.org>
Date: Sun, 2 Feb 2020 14:18:39 +0100
Subject: [PATCH] i810: Avoid duplicate definition of I810PatternROP
Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/commit/652d93cbbdc159c0883f1b626ea48e28bac63ae3]
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/legacy/i810/i810.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h
index 347188c9..19be049c 100644
--- a/src/legacy/i810/i810.h
+++ b/src/legacy/i810/i810.h
@@ -322,6 +322,6 @@ extern void I810InitMC(ScreenPtr pScreen);
extern const OptionInfoRec *I810AvailableOptions(int chipid, int busid);
extern const int I810CopyROP[16];
-const int I810PatternROP[16];
+extern const int I810PatternROP[16];
#endif /* _I810_H_ */
--
2.28.0

1
meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
View File

@@ -15,6 +15,7 @@ S = "${WORKDIR}/git"
SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \
file://0001-Sync-i915_pciids-upto-8717c6b7414f.patch \
file://0001-i810-Avoid-duplicate-definition-of-I810PatternROP.patch \
"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"