summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-driver/xf86-video-intel
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-09-11 21:30:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-11 23:31:00 +0100
commit33e8896a46ac75ad84ede22334c04e06e4d675a5 (patch)
treebeb923ac077388f8b61675098cafe2d663707a21 /meta/recipes-graphics/xorg-driver/xf86-video-intel
parent3f0525d8ce1176ced61795913370ed79804cf90d (diff)
downloadpoky-33e8896a46ac75ad84ede22334c04e06e4d675a5.tar.gz
xf86-video-intel: disable DRI2 tests if no DRI2 is available
Somehow this slipped past the initial testing and can cause build errors in non-GL distros. (From OE-Core rev: 975412f446066215a94be78a7f7e1db9e28ebbbf) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-driver/xf86-video-intel')
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch50
1 files changed, 50 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