Update mesa patches

4 files changed, 61 insertions, 39 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index 2ee050f..66cdf05 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -357,7 +357,8 @@ def BuilderList(slaves):
       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',
-                                    '0004-Fix-build-when-HAVE_LIBDRM-isn-t-defined.patch' ],
+                                    '0004-util-include-unistd.h-which-may-be-required-for-usle.patch',
+                                    '0005-Also-provide-timespec_get-fallback-if-a-POSIX-platfo.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
deleted file mode 100644
index 48e809c..0000000
--- a/patches/mesa-mesa/0004-Fix-build-when-HAVE_LIBDRM-isn-t-defined.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
-
diff --git a/patches/mesa-mesa/0004-util-include-unistd.h-which-may-be-required-for-usle.patch b/patches/mesa-mesa/0004-util-include-unistd.h-which-may-be-required-for-usle.patch
new file mode 100644
index 0000000..8a5fdae
--- /dev/null
+++ b/patches/mesa-mesa/0004-util-include-unistd.h-which-may-be-required-for-usle.patch
@@ -0,0 +1,32 @@
+From 0e26a9816a8208db135c0eae33bf43f0ff247fed Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Fri, 10 Nov 2017 11:41:13 +0000
+Subject: [PATCH 1/2] util: include unistd.h, which may be required for usleep
+ prototype
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This seems to be dropped in 222a2fb9 "util: move os_time.[ch] to src/util"
+
+../../../src/util/os_time.c: In function ‘os_time_sleep’:
+../../../src/util/os_time.c:104:4: error: implicit declaration of function ‘usleep’ [-Werror=implicit-function-declaration]
+---
+ src/util/os_time.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/util/os_time.c b/src/util/os_time.c
+index 8d8291ff173..72dc7e49c0e 100644
+--- a/src/util/os_time.c
++++ b/src/util/os_time.c
+@@ -40,6 +40,7 @@
+ #include "util/u_atomic.h"
+ 
+ #if defined(PIPE_OS_UNIX)
++#  include <unistd.h> /* usleep */
+ #  include <time.h> /* timeval */
+ #  include <sys/time.h> /* timeval */
+ #  include <sched.h> /* sched_yield */
+-- 
+2.15.0
+
diff --git a/patches/mesa-mesa/0005-Also-provide-timespec_get-fallback-if-a-POSIX-platfo.patch b/patches/mesa-mesa/0005-Also-provide-timespec_get-fallback-if-a-POSIX-platfo.patch
new file mode 100644
index 0000000..0576e18
--- /dev/null
+++ b/patches/mesa-mesa/0005-Also-provide-timespec_get-fallback-if-a-POSIX-platfo.patch
@@ -0,0 +1,27 @@
+From e04c7cfa3a3a560476d361a828070f7785da8bf0 Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Fri, 10 Nov 2017 12:22:25 +0000
+Subject: [PATCH 2/2] Also provide timespec_get fallback if a POSIX platform
+ doesn't have it
+
+... not just on Windows
+---
+ include/c11/threads_posix.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/c11/threads_posix.h b/include/c11/threads_posix.h
+index 7bf6a0f6ef6..45cb6075e6e 100644
+--- a/include/c11/threads_posix.h
++++ b/include/c11/threads_posix.h
+@@ -382,7 +382,7 @@ tss_set(tss_t key, void *val)
+ 
+ /*-------------------- 7.25.7 Time functions --------------------*/
+ // 7.25.6.1
+-#if 0
++#ifndef HAVE_TIMESPEC_GET
+ static inline int
+ timespec_get(struct timespec *ts, int base)
+ {
+-- 
+2.15.0
+