summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/mesa/fix-egl-compilation-without-x11-headers.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-05-29 15:57:06 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-07 16:48:25 +0100
commit7aa250c8b394d2c5d21e09dc8165d3002dd67f66 (patch)
treea3f7b819ec7130c5b0d1fff1c5bba2ac07931196 /meta/recipes-graphics/mesa/mesa/fix-egl-compilation-without-x11-headers.patch
parent78e8ce465b08aad617ce1cb013975be6980fc8a9 (diff)
downloadpoky-7aa250c8b394d2c5d21e09dc8165d3002dd67f66.tar.gz
mesa: upgrade to 9.1.3
Merge mesa-PV.bb and mesa-PV.inc as the is no point to the split now we're only building one variant of Mesa. Drop 0002-cross-compile.patch isn't needed as libtool is used instead of mklib. However, as libtool is used instead of mklib add fix-glsl-cross.patch to work around build failures caused by the cross libtool being used to build host binaries. Add EGL-Mutate-NativeDisplayType-depending-on-config.patch to build correctly in a non-X11 environment. Drop dont-fail-if-libX11-isnt-installed.patch and fix-egl-compilation-without-x11-headers.patch as they were backports. license.html had some formatting and typo fixes, update the checksum. (From OE-Core rev: d7033f4441183e53bf7fc8aa2293a9ec156a28dd) 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/recipes-graphics/mesa/mesa/fix-egl-compilation-without-x11-headers.patch')
-rw-r--r--meta/recipes-graphics/mesa/mesa/fix-egl-compilation-without-x11-headers.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-graphics/mesa/mesa/fix-egl-compilation-without-x11-headers.patch b/meta/recipes-graphics/mesa/mesa/fix-egl-compilation-without-x11-headers.patch
deleted file mode 100644
index 6436b592b4..0000000000
--- a/meta/recipes-graphics/mesa/mesa/fix-egl-compilation-without-x11-headers.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Upstream-Status: Submitted
2
3Picked from mesa-dev mailing list: http://marc.info/?l=mesa3d-dev&m=133053004130468
4
5From: Benjamin Franzke <benjaminfranzke@googlemail.com>
6Date: Wed, 29 Feb 2012 15:36:23 +0100
7Subject: [PATCH] configure: Fix egl compilation without x11 headers
8
9We dont want eglplatform.h to typedef egl native types
10to x11 types, when x11 headers are not available.
11---
12 configure.ac | 4 ++++
13 1 file changed, 4 insertions(+)
14
15diff --git a/configure.ac b/configure.ac
16index b384b44..8eb8459 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -1262,6 +1262,10 @@ if test "x$enable_egl" = xyes; then
20
21 AC_CHECK_FUNC(mincore, [DEFINES="$DEFINES -DHAVE_MINCORE"])
22
23+ if test "$have_x" != yes; then
24+ DEFINES="$DEFINES -DMESA_EGL_NO_X11_HEADERS"
25+ fi
26+
27 if test "$enable_static" != yes; then
28 # build egl_glx when libGL is built
29 if test "x$enable_glx" = xyes; then
30--
311.7.10.4
32