summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch24
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch17
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb4
3 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch
deleted file mode 100644
index 8a5dd39ae1..0000000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Include xorg-server.h to fix build errors seen with glibc 2.20
2
3In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0,
4 from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/i586-oe-linux/xf86-video-intel/2_2.99.912-r0/xf86-video-intel-2.99.912/src/backlight.c:39:
5/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
6 strndup(const char *str, size_t n);
7 ^
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11Upstream-Status: Pending
12
13Index: xf86-video-intel-2.99.912/src/backlight.c
14===================================================================
15--- xf86-video-intel-2.99.912.orig/src/backlight.c 2014-04-09 10:41:18.000000000 -0700
16+++ xf86-video-intel-2.99.912/src/backlight.c 2014-08-28 18:52:25.524070587 -0700
17@@ -29,6 +29,7 @@
18 #include "config.h"
19 #endif
20
21+#include <xorg-server.h>
22 #include <sys/types.h>
23 #include <sys/wait.h>
24 #include <sys/stat.h>
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch
deleted file mode 100644
index 3dddd334bf..0000000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1These modules are only used for tests that don't get installed, and the
2automatic detection without explicit dependencies means that a build can find
3e.g. xshmfence at configure time but then it's been removed from the sysroot by
4the time compile happens.
5
6As the tests don't get installed, just disable the checks.
7
8Upstream-Status: Inappropriate [OE-specific]
9Signed-off-by: Ross Burton <ross.burton@intel.com>
10
11diff --git a/configure.ac b/configure.ac
12index bd654f3..78a0e0d 100644
13--- a/configure.ac
14+++ b/configure.ac
15@@ -279 +279 @@ fi
16-PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-xfixes xcb-present x11-xcb xshmfence x11 xcomposite xdamage xrender xrandr xxf86vm xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])
17+#PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-xfixes xcb-present x11-xcb xshmfence x11 xcomposite xdamage xrender xrandr xxf86vm xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])
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 893f5ce3f6..a60da70840 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
@@ -14,13 +14,9 @@ PV = "2.99.917+git${SRCPV}"
14S = "${WORKDIR}/git" 14S = "${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://disable-x11-dri3.patch \
18 file://always_include_xorg_server.h.patch \
19 file://0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch \ 17 file://0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch \
20 " 18 "
21 19
22SRC_URI[md5sum] = "fa196a66e52c0c624fe5d350af7a5e7b"
23SRC_URI[sha256sum] = "00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9"
24UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" 20UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
25 21
26DEPENDS += "virtual/libx11 drm libpciaccess pixman" 22DEPENDS += "virtual/libx11 drm libpciaccess pixman"