summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-07-17 17:41:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-19 00:09:02 +0100
commit551e456c714662e84eb50dd6d8143b95524ab6d6 (patch)
tree80512078432952f2080c6cfa3422b5c156674e6e /meta
parentee2b26fe759d1d8a0f78c94f1a4f3cfe30ff3c5d (diff)
downloadpoky-551e456c714662e84eb50dd6d8143b95524ab6d6.tar.gz
xf86-video-intel: disable non-deterministic tests for libX11
libX11 et al are checked for at confgure time and tests optionally built. As these don't get installed we don't want to add build dependencies, but the non-determinism means that builds can fail. (From OE-Core rev: cc4de34c94a89831c2aac56b9fb78612cdde0099) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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_2.99.912.bb3
2 files changed, 19 insertions, 1 deletions
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
new file mode 100644
index 0000000000..dda508dcfd
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch
@@ -0,0 +1,17 @@
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@@ -251 +251 @@ fi
16-PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])
17+#PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb
index 07776908ad..544de4ab55 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb
@@ -9,7 +9,8 @@ Infrastructure (DRI)."
9 9
10LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" 10LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
11 11
12SRC_URI += "file://configure-dri.patch" 12SRC_URI += "file://configure-dri.patch \
13 file://disable-x11-dri3.patch"
13 14
14SRC_URI[md5sum] = "88d1a884f9b7bd07bf0755cfa34052d4" 15SRC_URI[md5sum] = "88d1a884f9b7bd07bf0755cfa34052d4"
15SRC_URI[sha256sum] = "7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501" 16SRC_URI[sha256sum] = "7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501"