From 104dc3b637b728a2a62711d9be9ca4f956ddc808 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 20 Nov 2013 01:40:13 +0100
Subject: [PATCH] Mesa: build with EGL and GBM support, enable GLX TLS support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/graphics/Mesa/package.mk | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/graphics/Mesa/package.mk b/packages/graphics/Mesa/package.mk
index 9baac4575f..aed4c7a18f 100644
--- a/packages/graphics/Mesa/package.mk
+++ b/packages/graphics/Mesa/package.mk
@@ -78,7 +78,6 @@ PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \
                            --enable-asm \
                            --disable-selinux \
                            --enable-opengl \
-                           --enable-glx-tls \
                            --enable-driglx-direct \
                            --disable-gles1 \
                            --disable-gles2 \
@@ -87,10 +86,10 @@ PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \
                            --disable-dri3 \
                            --enable-glx \
                            --disable-osmesa \
-                           --disable-egl \
+                           --enable-egl --with-egl-platforms=x11,drm \
                            --disable-xorg \
                            $XA_CONFIG \
-                           --disable-gbm \
+                           --enable-gbm \
                            --disable-xvmc \
                            $MESA_VDPAU \
                            --disable-opencl \
@@ -100,7 +99,7 @@ PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \
                            --disable-r600-llvm-compiler \
                            --disable-gallium-tests \
                            --enable-shared-glapi \
-                           --disable-glx-tls \
+                           --enable-glx-tls \
                            --disable-gallium-g3dvl \
                            $MESA_GALLIUM_LLVM \
                            --disable-silent-rules \
@@ -110,6 +109,12 @@ PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \
                            --with-dri-drivers=$DRI_DRIVERS \
                            --with-expat=$SYSROOT_PREFIX/usr"
 
+
+pre_configure_target() {
+  # Mesa fails to build with GOLD if we build with --enable-glx-tls
+  strip_gold
+}
+
 post_makeinstall_target() {
   # rename and relink for cooperate with nvidia drivers
     rm -rf $INSTALL/usr/lib/libGL.so