summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch50
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.13.bb2
2 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch
new file mode 100644
index 0000000000..9e93ca875c
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch
@@ -0,0 +1,50 @@
1Upstream-Status: Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From ec91cfe7e5efdd5e1b1fbb85eea8f07b50e24c4b Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Wed, 11 Sep 2013 21:12:37 +0100
7Subject: [PATCH] test: only build DRI2 tests if DRI2 is enabled
8
9Signed-off-by: Ross Burton <ross.burton@intel.com>
10---
11 test/Makefile.am | 10 ++++++++++
12 1 file changed, 10 insertions(+)
13
14diff --git a/test/Makefile.am b/test/Makefile.am
15index f51967b..18528a9 100644
16--- a/test/Makefile.am
17+++ b/test/Makefile.am
18@@ -16,9 +16,14 @@ stress_TESTS = \
19 render-copyarea-size \
20 render-copy-alphaless \
21 mixed-stress \
22+ $(NULL)
23+
24+if DRI2
25+stress_TESTS += \
26 dri2-swap \
27 dri2-race \
28 $(NULL)
29+endif
30
31 check_PROGRAMS = $(stress_TESTS)
32
33@@ -34,9 +39,14 @@ libtest_la_SOURCES = \
34 test_image.c \
35 test_log.c \
36 test_render.c \
37+ $(NULL)
38+
39+if DRI2
40+libtest_la_SOURCES += \
41 dri2.c \
42 dri2.h \
43 $(NULL)
44+endif
45
46 vsync.avi: mkvsync.sh
47 ./mkvsync.sh $@
48--
491.7.10.4
50
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.13.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.13.bb
index f26544b3c9..3e309362a6 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.13.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.13.bb
@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
11 11
12DEPENDS += "virtual/libx11 drm libpciaccess pixman" 12DEPENDS += "virtual/libx11 drm libpciaccess pixman"
13 13
14SRC_URI += "file://disable-dri2-tests.patch"
15
14PACKAGECONFIG ??= "sna udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" 16PACKAGECONFIG ??= "sna udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}"
15 17
16PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xf86driproto dri2proto" 18PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xf86driproto dri2proto"