Update mesa patch

3 files changed, 32 insertions, 28 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index bd6c086..da71312 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -356,7 +356,7 @@ 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',
-                                    '0005-Also-provide-timespec_get-fallback-if-a-POSIX-platfo.patch',
+                                    '0005-Provide-timespec_get-in-C11-thread.h-emulation-on-PO.patch',
                                     '0006-Bodge-the-shared-library-filenames-used-in-es-1-2-ap.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' ],
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
deleted file mode 100644
index 0576e18..0000000
--- a/patches/mesa-mesa/0005-Also-provide-timespec_get-fallback-if-a-POSIX-platfo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
-
diff --git a/patches/mesa-mesa/0005-Provide-timespec_get-in-C11-thread.h-emulation-on-PO.patch b/patches/mesa-mesa/0005-Provide-timespec_get-in-C11-thread.h-emulation-on-PO.patch
new file mode 100644
index 0000000..d0d7e0e
--- /dev/null
+++ b/patches/mesa-mesa/0005-Provide-timespec_get-in-C11-thread.h-emulation-on-PO.patch
@@ -0,0 +1,31 @@
+From 90cf1c8dc3ab631f5a196533ef87d3df28f63f56 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] Provide timespec_get() in C11 thread.h emulation on POSIX
+ also
+
+Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+---
+ include/c11/threads_posix.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/include/c11/threads_posix.h b/include/c11/threads_posix.h
+index 2d7ac1326de..25076f1b6e5 100644
+--- a/include/c11/threads_posix.h
++++ b/include/c11/threads_posix.h
+@@ -382,7 +382,6 @@ tss_set(tss_t key, void *val)
+ 
+ /*-------------------- 7.25.7 Time functions --------------------*/
+ // 7.25.6.1
+-#ifdef __HAIKU__
+ static inline int
+ timespec_get(struct timespec *ts, int base)
+ {
+@@ -393,4 +392,3 @@ timespec_get(struct timespec *ts, int base)
+     }
+     return 0;
+ }
+-#endif
+-- 
+2.15.0
+