diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-driver/xf86-video-intel')
5 files changed, 286 insertions, 0 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 new file mode 100644 index 0000000000..8a5dd39ae1 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | Include xorg-server.h to fix build errors seen with glibc 2.20 | ||
2 | |||
3 | In 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 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Index: 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/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch new file mode 100644 index 0000000000..3a42d1377c --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | From 524a45da56e2a052ffafa3887891caa90ba39f76 Mon Sep 17 00:00:00 2001 | ||
4 | From: Chris Wilson <chris@chris-wilson.co.uk> | ||
5 | Date: Sat, 5 Oct 2013 18:42:24 +0100 | ||
6 | Subject: [PATCH] compat-api: Map changes of DamageUnregister API in 1.14.99.2 | ||
7 | |||
8 | Reported-by: Emmanuel Benisty <benisty.e@gmail.com> | ||
9 | Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> | ||
10 | --- | ||
11 | src/compat-api.h | 4 ++++ | ||
12 | 1 file changed, 4 insertions(+) | ||
13 | |||
14 | diff --git a/src/compat-api.h b/src/compat-api.h | ||
15 | index 8eb46ef..244a486 100644 | ||
16 | --- a/src/compat-api.h | ||
17 | +++ b/src/compat-api.h | ||
18 | @@ -162,4 +162,8 @@ static inline void FreePixmap(PixmapPtr pixmap) | ||
19 | if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h) | ||
20 | #endif | ||
21 | |||
22 | +#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0) | ||
23 | +#define DamageUnregister(d, dd) DamageUnregister(dd) | ||
24 | +#endif | ||
25 | + | ||
26 | #endif | ||
27 | -- | ||
28 | 1.7.9.5 | ||
29 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/configure-dri.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/configure-dri.patch new file mode 100644 index 0000000000..7fa9443d93 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/configure-dri.patch | |||
@@ -0,0 +1,166 @@ | |||
1 | Add the ability to enable/disable specific versions of the DRI support. | ||
2 | |||
3 | This is the following two commits from master squashed: | ||
4 | 7bc669dd4b7e3e5978e95e4131d1f9215afbc041 | ||
5 | 5a0cb1049c2fa0586708719210a2d2cffa7a4491 | ||
6 | |||
7 | Upstream-Status: Backport | ||
8 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
9 | |||
10 | diff --git a/configure.ac b/configure.ac | ||
11 | index b3b6e8e..bd654f3 100644 | ||
12 | --- a/configure.ac | ||
13 | +++ b/configure.ac | ||
14 | @@ -296,6 +296,21 @@ AC_ARG_ENABLE(dri, | ||
15 | [Disable DRI support [[default=auto]]]), | ||
16 | [DRI=$enableval], | ||
17 | [DRI=auto]) | ||
18 | +AC_ARG_ENABLE(dri1, | ||
19 | + AS_HELP_STRING([--disable-dri1], | ||
20 | + [Disable DRI1 support [[default=yes]]]), | ||
21 | + [DRI1=$enableval], | ||
22 | + [DRI1=yes]) | ||
23 | +AC_ARG_ENABLE(dri2, | ||
24 | + AS_HELP_STRING([--disable-dri2], | ||
25 | + [Disable DRI2 support [[default=yes]]]), | ||
26 | + [DRI2=$enableval], | ||
27 | + [DRI2=yes]) | ||
28 | +AC_ARG_ENABLE(dri3, | ||
29 | + AS_HELP_STRING([--disable-dri3], | ||
30 | + [Disable DRI3 support [[default=yes]]]), | ||
31 | + [DRI3=$enableval], | ||
32 | + [DRI3=yes]) | ||
33 | |||
34 | AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc], | ||
35 | [Disable XvMC support [[default=yes]]]), | ||
36 | @@ -461,15 +476,15 @@ if test "x$UMS" = "xyes"; then | ||
37 | AC_DEFINE(UMS,1,[Assume UMS support]) | ||
38 | fi | ||
39 | |||
40 | -DRI1=no | ||
41 | +have_dri1=no | ||
42 | XORG_DRIVER_CHECK_EXT(XF86DRI, xf86driproto) | ||
43 | -if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$UMS" = "xyes"; then | ||
44 | - PKG_CHECK_MODULES(DRI1, [xf86driproto], [DRI1=$DRI], [DRI1=no]) | ||
45 | +if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$DRI1" != "xno" -a "x$UMS" = "xyes"; then | ||
46 | + PKG_CHECK_MODULES(DRI1, [xf86driproto], [have_dri1=$DRI], [have_dri1=no]) | ||
47 | save_CFLAGS="$CFLAGS" | ||
48 | save_CPPFLAGS="$CPPFLAGS" | ||
49 | CFLAGS="$CFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS" | ||
50 | CPPFLAGS="$CPPFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS" | ||
51 | - AC_CHECK_HEADERS([dri.h sarea.h dristruct.h], [], [DRI1=no], | ||
52 | + AC_CHECK_HEADERS([dri.h sarea.h dristruct.h], [], [have_dri1=no], | ||
53 | [/* for dri.h */ | ||
54 | #include <xf86str.h> | ||
55 | /* for dristruct.h */ | ||
56 | @@ -486,49 +501,55 @@ if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$UMS" = "xyes"; then | ||
57 | fi | ||
58 | |||
59 | AC_MSG_CHECKING([whether to include DRI1 support]) | ||
60 | -AC_MSG_RESULT([$DRI1]) | ||
61 | +AC_MSG_RESULT([$have_dri1]) | ||
62 | |||
63 | -AM_CONDITIONAL(DRI1, test "x$DRI1" != "xno") | ||
64 | -if test "x$DRI1" != "xno"; then | ||
65 | +AM_CONDITIONAL(DRI1, test "x$have_dri1" != "xno") | ||
66 | +if test "x$have_dri1" != "xno"; then | ||
67 | AC_DEFINE(HAVE_DRI1,1,[Enable DRI1 driver support]) | ||
68 | dri_msg="$dri_msg DRI1" | ||
69 | else | ||
70 | DRI1_CFLAGS="" | ||
71 | DRI1_LIBS="" | ||
72 | |||
73 | - if test "x$DRI" = "xyes" -a "x$UMS" = "xyes"; then | ||
74 | + if test "x$DRI" = "xyes" -a "x$UMS" = "xyes" -a "x$DRI1" != "xno"; then | ||
75 | AC_MSG_ERROR([DRI1 requested but prerequisites not found]) | ||
76 | fi | ||
77 | fi | ||
78 | |||
79 | -DRI2=no | ||
80 | -DRI3=no | ||
81 | +have_dri2=no | ||
82 | +have_dri3=no | ||
83 | if test "x$DRI" != "xno"; then | ||
84 | - PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6], [DRI2=$DRI], [DRI2=no]) | ||
85 | - dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri` | ||
86 | - if test "x$dridriverdir" = "x"; then | ||
87 | - dridriverdir="$libdir/dri" | ||
88 | - fi | ||
89 | - AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI2 driver path]) | ||
90 | if test "x$DRI2" != "xno"; then | ||
91 | + PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6], [have_dri2=$DRI], [have_dri2=no]) | ||
92 | + fi | ||
93 | + if test "x$have_dri2" != "xno"; then | ||
94 | save_CFLAGS=$CFLAGS | ||
95 | CFLAGS="$XORG_CFLAGS $DRM_CFLAGS $DRI1_CFLAGS $DRI2_CFLAGS" | ||
96 | - AC_CHECK_HEADERS([dri2.h], [], [DRI2=no], [ | ||
97 | + AC_CHECK_HEADERS([dri2.h], [], [have_dri2=no], [ | ||
98 | #include <dixstruct.h> | ||
99 | #include <drm.h> | ||
100 | ]) | ||
101 | CFLAGS=$save_CFLAGS | ||
102 | fi | ||
103 | - | ||
104 | - XORG_DRIVER_CHECK_EXT(DRI3, dri3proto) | ||
105 | - if test "x$_EXT_CHECK" != "xno"; then | ||
106 | - PKG_CHECK_MODULES(DRI3, [dri3proto], [DRI3=$DRI], []) | ||
107 | + if test "x$have_dri2" != "xno"; then | ||
108 | + dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri` | ||
109 | + if test "x$dridriverdir" = "x"; then | ||
110 | + dridriverdir="$libdir/dri" | ||
111 | + fi | ||
112 | + AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default have_dri2 driver path]) | ||
113 | fi | ||
114 | + | ||
115 | if test "x$DRI3" != "xno"; then | ||
116 | + XORG_DRIVER_CHECK_EXT(DRI3, dri3proto) | ||
117 | + if test "x$_EXT_CHECK" != "xno"; then | ||
118 | + PKG_CHECK_MODULES(DRI3, [dri3proto], [have_dri3=$DRI], []) | ||
119 | + fi | ||
120 | + fi | ||
121 | + if test "x$have_dri3" != "xno"; then | ||
122 | save_CFLAGS=$CFLAGS | ||
123 | CFLAGS="$XORG_CFLAGS $DRI3_CFLAGS" | ||
124 | - AC_CHECK_DECL(DRI3, [], [DRI3=no], [#include <xorg-server.h>]) | ||
125 | - AC_CHECK_HEADERS([misyncstr.h misyncshm.h], [], [DRI3=no], [ | ||
126 | + AC_CHECK_DECL(DRI3, [], [have_dri3=no], [#include <xorg-server.h>]) | ||
127 | + AC_CHECK_HEADERS([misyncstr.h misyncshm.h], [], [have_dri3=no], [ | ||
128 | #include <xorg-server.h> | ||
129 | #include <xf86str.h> | ||
130 | #include <misync.h> | ||
131 | @@ -538,13 +559,13 @@ if test "x$DRI" != "xno"; then | ||
132 | fi | ||
133 | |||
134 | AC_MSG_CHECKING([whether to include DRI2 support]) | ||
135 | -AM_CONDITIONAL(DRI2, test "x$DRI2" != "xno") | ||
136 | -AC_MSG_RESULT([$DRI2]) | ||
137 | -if test "x$DRI2" != "xno"; then | ||
138 | +AM_CONDITIONAL(DRI2, test "x$have_dri2" != "xno") | ||
139 | +AC_MSG_RESULT([$have_dri2]) | ||
140 | +if test "x$have_dri2" != "xno"; then | ||
141 | AC_DEFINE(HAVE_DRI2,1,[Enable DRI2 driver support]) | ||
142 | dri_msg="$dri_msg DRI2" | ||
143 | else | ||
144 | - if test "x$DRI" = "xyes" -a "x$KMS" = "xyes"; then | ||
145 | + if test "x$DRI" = "xyes" -a "x$DRI2" != "xno" -a "x$KMS" = "xyes"; then | ||
146 | AC_MSG_ERROR([DRI2 requested but prerequisites not found]) | ||
147 | fi | ||
148 | |||
149 | @@ -553,13 +574,13 @@ else | ||
150 | fi | ||
151 | |||
152 | AC_MSG_CHECKING([whether to include DRI3 support]) | ||
153 | -AM_CONDITIONAL(DRI3, test "x$DRI3" != "xno") | ||
154 | -AC_MSG_RESULT([$DRI3]) | ||
155 | -if test "x$DRI3" != "xno"; then | ||
156 | +AM_CONDITIONAL(DRI3, test "x$have_dri3" != "xno") | ||
157 | +AC_MSG_RESULT([$have_dri3]) | ||
158 | +if test "x$have_dri3" != "xno"; then | ||
159 | AC_DEFINE(HAVE_DRI3,1,[Enable DRI3 driver support]) | ||
160 | dri_msg="$dri_msg DRI3" | ||
161 | else | ||
162 | - if test "x$DRI" = "xyes" -a "x$KMS" = "xyes"; then | ||
163 | + if test "x$DRI" = "xyes" -a "x$DRI3" != "xno" -a "x$KMS" = "xyes"; then | ||
164 | AC_MSG_ERROR([DRI3 requested but prerequisites not found]) | ||
165 | fi | ||
166 | fi | ||
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 @@ | |||
1 | Upstream-Status: Submitted | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From ec91cfe7e5efdd5e1b1fbb85eea8f07b50e24c4b Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Wed, 11 Sep 2013 21:12:37 +0100 | ||
7 | Subject: [PATCH] test: only build DRI2 tests if DRI2 is enabled | ||
8 | |||
9 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
10 | --- | ||
11 | test/Makefile.am | 10 ++++++++++ | ||
12 | 1 file changed, 10 insertions(+) | ||
13 | |||
14 | diff --git a/test/Makefile.am b/test/Makefile.am | ||
15 | index 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 | -- | ||
49 | 1.7.10.4 | ||
50 | |||
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 @@ | |||
1 | These modules are only used for tests that don't get installed, and the | ||
2 | automatic detection without explicit dependencies means that a build can find | ||
3 | e.g. xshmfence at configure time but then it's been removed from the sysroot by | ||
4 | the time compile happens. | ||
5 | |||
6 | As the tests don't get installed, just disable the checks. | ||
7 | |||
8 | Upstream-Status: Inappropriate [OE-specific] | ||
9 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
10 | |||
11 | diff --git a/configure.ac b/configure.ac | ||
12 | index 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"]) | ||