Add patch needed to build mesa-glut

2 files changed, 71 insertions, 2 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index c4c550a..16826ba 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -353,11 +353,12 @@ def BuilderList(slaves):
 
       # some repos need patches (which are not yet upstreamable) applied
       patches = { 'mesa-mesa' :   [ '0001-gallium-targets-dri-explicitly-link-against-glapi-us.patch',
-                                    '0002-megadriver-explicitly-link-against-glapi-link-with-n.patch'],
+                                    '0002-megadriver-explicitly-link-against-glapi-link-with-n.patch' ],
+                  'mesa-glut' :   [ '0001-Fix-build-when-GL-or-libX11-are-in-non-standard-loca.patch' ],
                   'app-sessreg' : [ '0001-Don-t-try-to-use-utmpx-functions-if-WTMPX_FILE-isn-t.patch' ],
                   'app-xdm' :     [ '0001-Workaround-Cygwin-s-failure-to-prototype-initgroups.patch' ],
                   'xserver' :     [ '0001-Bodge-around-prototype-scoping-issues-with-winmultiw.patch',
-                                    '0002-Bodge-around-prototype-scoping-issues-with-winauth.c.patch'],
+                                    '0002-Bodge-around-prototype-scoping-issues-with-winauth.c.patch' ],
                   'khronos-opengl-registry' : [ 'Makefile.patch' ] }
 
       if name in patches:
diff --git a/patches/mesa-glut/0001-Fix-build-when-GL-or-libX11-are-in-non-standard-loca.patch b/patches/mesa-glut/0001-Fix-build-when-GL-or-libX11-are-in-non-standard-loca.patch
new file mode 100755
index 0000000..461e8c0
--- /dev/null
+++ b/patches/mesa-glut/0001-Fix-build-when-GL-or-libX11-are-in-non-standard-loca.patch
@@ -0,0 +1,68 @@
+From 78ff211546ff2233d3310f48ed529ce03183df7c Mon Sep 17 00:00:00 2001
+From: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Wed, 23 Sep 2015 21:08:49 +0100
+Subject: [PATCH] Fix build when GL or libX11 are in non-standard locations
+
+Also, honor NOCONFIGURE
+
+Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+---
+ autogen.sh          |  4 +++-
+ configs/autoconf.in |  1 +
+ configure.ac        | 16 ++++++----------
+ 3 files changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index c76bf8b..b5f6ec4 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -15,4 +15,6 @@ MAKEFLAGS=""
+ 
+ autoreconf -v --install || exit 1
+ 
+-"$srcdir"/configure "$@"
++if test -z "$NOCONFIGURE"; then
++    "$srcdir"/configure "$@"
++fi
+diff --git a/configs/autoconf.in b/configs/autoconf.in
+index 5dd43f3..2dfa87c 100644
+--- a/configs/autoconf.in
++++ b/configs/autoconf.in
+@@ -75,6 +75,7 @@ X11_INCLUDES = @X11_INCLUDES@
+ 
+ # Library/program dependencies
+ GL_LIB_DEPS = $(EXTRA_LIB_PATH) @GL_LIB_DEPS@
++GLUT_LIB_DEPS = @GLUT_LIB_DEPS@ @GLUT_MESA_DEPS@
+ 
+ # Autoconf directories
+ prefix = @prefix@
+diff --git a/configure.ac b/configure.ac
+index d42b5c6..788cd32 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -373,16 +373,12 @@ dnl
+ dnl GLUT configuration
+ dnl
+ SRC_DIRS="$SRC_DIRS glut/glx"
+-if test "$x11_pkgconfig" = yes; then
+-    PKG_CHECK_MODULES([GLUT],[x11 xmu xi])
+-    GLUT_PC_REQ_PRIV="x11 xmu xi"
+-    GLUT_LIB_DEPS="$GLUT_LIBS"
+-else
+-    # should check these...
+-    GLUT_LIB_DEPS="$X_LIBS -lX11 -lXmu -lXi"
+-    GLUT_PC_LIB_PRIV="$GLUT_LIB_DEPS"
+-    GLUT_PC_CFLAGS="$X11_INCLUDES"
+-fi
++PKG_CHECK_MODULES([GLUT],[x11 xmu xi])
++GLUT_LIB_DEPS="$GLUT_LIBS"
++GLUT_CFLAGS="$GLUT_CFLAGS"
++GLUT_PC_REQ_PRIV="x11 xmu xi"
++GLUT_PC_LIB_PRIV="$GLUT_LIB_DEPS"
++GLUT_PC_CFLAGS="$X11_INCLUDES $GLUT_CFLAGS"
+ if test "x$GCC" = xyes; then
+     GLUT_CFLAGS="$GLUT_CFLAGS -fexceptions"
+ fi
+-- 
+2.5.1
+