mesa: don't fail if x11 isn't available

Patches backported from mesa Git and from mesa-dev mailing list.

(From OE-Core rev: f704bb42062f2ac15edaad36497a8d2815b8b8b2)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 32 insertions, 0 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
new file mode 100644
index 0000000000..6436b592b4
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/fix-egl-compilation-without-x11-headers.patch
@@ -0,0 +1,32 @@
+Upstream-Status: Submitted
+
+Picked from mesa-dev mailing list: http://marc.info/?l=mesa3d-dev&m=133053004130468
+
+From: Benjamin Franzke <benjaminfranzke@googlemail.com>
+Date: Wed, 29 Feb 2012 15:36:23 +0100
+Subject: [PATCH] configure: Fix egl compilation without x11 headers
+
+We dont want eglplatform.h to typedef egl native types
+to x11 types, when x11 headers are not available.
+---
+ configure.ac |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index b384b44..8eb8459 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1262,6 +1262,10 @@ if test "x$enable_egl" = xyes; then
+ 
+     AC_CHECK_FUNC(mincore, [DEFINES="$DEFINES -DHAVE_MINCORE"])
+ 
++    if test "$have_x" != yes; then
++        DEFINES="$DEFINES -DMESA_EGL_NO_X11_HEADERS"
++    fi
++
+     if test "$enable_static" != yes; then
+         # build egl_glx when libGL is built
+         if test "x$enable_glx" = xyes; then
+-- 
+1.7.10.4
+