summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-06-15 16:31:28 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-18 09:14:07 +0100
commit64df52da57440b8d1f97a8f228399954effb7700 (patch)
tree4a9c4b65f75e31711715e5265f9a66651a909d1c
parent6353ee67edad85112b3a28679eb06cb6a281b005 (diff)
downloadpoky-64df52da57440b8d1f97a8f228399954effb7700.tar.gz
piglit: Add missing inclusion of Xutil.h
The EGL tests rely on Xutil.h being included. Some EGL implementation does not explitly include it by default and than the build fail. This fixes the build in imx53qsb board, of meta-fsl-arm, but is a generic fix. (From OE-Core rev: 8fe5ca4c6ed49f3f4b0dc67d0932e010bc32051b) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch28
-rw-r--r--meta/recipes-graphics/piglit/piglit_git.bb5
2 files changed, 31 insertions, 2 deletions
diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch
new file mode 100644
index 0000000000..c27cc04f01
--- /dev/null
+++ b/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch
@@ -0,0 +1,28 @@
1Upstream-Status: Backport
2Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
3
4From e40e0a25f996d2e205c4bdec2c8a5cc7f74e5065 Mon Sep 17 00:00:00 2001
5From: Otavio Salvador <otavio@ossystems.com.br>
6Date: Mon, 15 Jun 2015 16:25:30 -0300
7Subject: tests: Fix missing include of Xutil.h
8
9The EGL tests rely on Xutil.h being included. Some EGL implementation
10does not explitly include it by default and then the build fails.
11
12Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
13Reviewed-by: Neil Roberts <neil@linux.intel.com>
14
15diff --git a/tests/egl/egl-configless-context.c b/tests/egl/egl-configless-context.c
16index 0504a26..154b55c 100644
17--- a/tests/egl/egl-configless-context.c
18+++ b/tests/egl/egl-configless-context.c
19@@ -32,6 +32,7 @@
20 /* Chunks of code in this file are taken from egl-util.c */
21
22 #include <X11/Xlib.h>
23+#include <X11/Xutil.h>
24
25 #include "piglit-util-gl.h"
26 #include "piglit-util-egl.h"
27--
28cgit v0.10.2
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 75e41fefc2..9e6dc2c406 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -2,7 +2,8 @@ SUMMARY = "OpenGL driver testing framework"
2LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause" 2LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause"
3LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" 3LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
4 4
5SRC_URI = "git://anongit.freedesktop.org/piglit" 5SRC_URI = "git://anongit.freedesktop.org/piglit \
6 file://0001-tests-Fix-missing-include-of-Xutil.h.patch"
6 7
7# From 2014/12/04 8# From 2014/12/04
8SRCREV = "126c7d049b8f32e541625d5a35fbc5f5e4e7fbf8" 9SRCREV = "126c7d049b8f32e541625d5a35fbc5f5e4e7fbf8"
@@ -28,4 +29,4 @@ RDEPENDS_${PN} = "waffle python python-mako python-json python-subprocess \
28 mesa-demos bash \ 29 mesa-demos bash \
29 " 30 "
30 31
31INSANE_SKIP_${PN} += "dev-so" \ No newline at end of file 32INSANE_SKIP_${PN} += "dev-so"