Add another mesa patch

2 files changed, 40 insertions, 1 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index ef7ecfc..2ee050f 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -356,7 +356,8 @@ 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',
-                                    '0003-Fix-building-libwindowsdri-when-libX11-headers-are-i.patch' ],
+                                    '0003-Fix-building-libwindowsdri-when-libX11-headers-are-i.patch',
+                                    '0004-Fix-build-when-HAVE_LIBDRM-isn-t-defined.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' ],
diff --git a/patches/mesa-mesa/0004-Fix-build-when-HAVE_LIBDRM-isn-t-defined.patch b/patches/mesa-mesa/0004-Fix-build-when-HAVE_LIBDRM-isn-t-defined.patch
new file mode 100644
index 0000000..48e809c
--- /dev/null
+++ b/patches/mesa-mesa/0004-Fix-build-when-HAVE_LIBDRM-isn-t-defined.patch
@@ -0,0 +1,38 @@
+From b9286109b7037af043ba5d6ebb37f620f530e578 Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu, 17 Aug 2017 22:10:52 +0100
+Subject: [PATCH] Fix build when HAVE_LIBDRM isn't defined
+
+make[4]: Entering directory '/wip/mesa/build/src/gallium/targets/dri'
+  CXXLD    gallium_dri.la
+../../../../src/gallium/auxiliary/pipe-loader/.libs/libpipe_loader_static.a(libpipe_loader_static_la-pipe_loader.o): In function `pipe_loader_get_driinfo_xml':
+/mesa/build/src/gallium/auxiliary/pipe-loader/../../../../../src/gallium/auxiliary/pipe-loader/pipe_loader.c:117: undefined reference to `pipe_loader_drm_get_driinfo_xml'
+
+b4ff5e90 uses pipe_loader_get_driinfo_xml() unconditionally in
+pipe_loader.c, but it's definition in pipe_loader_get_driinfo_xml() is only
+built if HAVE_LIBDRM.
+
+Arrange to always use the default XML if HAVE_LIBDRM isn't defined.
+---
+ src/gallium/auxiliary/pipe-loader/pipe_loader.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.c b/src/gallium/auxiliary/pipe-loader/pipe_loader.c
+index 926db49fd24..e7cf9f86d99 100644
+--- a/src/gallium/auxiliary/pipe-loader/pipe_loader.c
++++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.c
+@@ -114,7 +114,11 @@ pipe_loader_load_options(struct pipe_loader_device *dev)
+ char *
+ pipe_loader_get_driinfo_xml(const char *driver_name)
+ {
++#ifdef HAVE_LIBDRM
+    char *xml = pipe_loader_drm_get_driinfo_xml(driver_name);
++#else
++   char *xml = NULL;
++#endif
+ 
+    if (!xml)
+       xml = strdup(gallium_driinfo_xml);
+-- 
+2.14.1
+