Update mesa patches

4 files changed, 74 insertions, 77 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index da71312..a90b66f 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -356,8 +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-Provide-timespec_get-in-C11-thread.h-emulation-on-PO.patch',
-                                    '0006-Bodge-the-shared-library-filenames-used-in-es-1-2-ap.patch' ],
+                                    '0006-Teach-es-1-2-api-ABI-check-shared-library-filenames-.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/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
deleted file mode 100644
index d0d7e0e..0000000
--- a/patches/mesa-mesa/0005-Provide-timespec_get-in-C11-thread.h-emulation-on-PO.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
-
diff --git a/patches/mesa-mesa/0006-Bodge-the-shared-library-filenames-used-in-es-1-2-ap.patch b/patches/mesa-mesa/0006-Bodge-the-shared-library-filenames-used-in-es-1-2-ap.patch
deleted file mode 100644
index 551f2ef..0000000
--- a/patches/mesa-mesa/0006-Bodge-the-shared-library-filenames-used-in-es-1-2-ap.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From b49ce1904db534ca36a31a3cb07fab545bae70e0 Mon Sep 17 00:00:00 2001
-From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Sat, 11 Nov 2017 14:48:10 +0000
-Subject: [PATCH] Bodge the shared library filenames used in
- es{1,2}api/ABI-check
-
-XXX: Really we need to find out the library filename from libtool, but
-that doesn't seem to be a feature...
-
-Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
----
- src/mapi/es1api/ABI-check | 2 +-
- src/mapi/es2api/ABI-check | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/mapi/es1api/ABI-check b/src/mapi/es1api/ABI-check
-index bd9d0288d60..acb088fc1fa 100755
---- a/src/mapi/es1api/ABI-check
-+++ b/src/mapi/es1api/ABI-check
-@@ -9,7 +9,7 @@ set -eu
- # or in extensions that are part of the ES 1.1 extension pack.
- # (see http://www.khronos.org/registry/gles/specs/1.1/opengles_spec_1_1_extension_pack.pdf)
- 
--LIB=${1-es1api/.libs/libGLESv1_CM.so.1}
-+LIB=${1-es1api/.libs/cygGLESv1_CM-1.dll}
- 
- if ! [ -f "$LIB" ]
- then
-diff --git a/src/mapi/es2api/ABI-check b/src/mapi/es2api/ABI-check
-index 179bea132e3..d64fadba0a3 100755
---- a/src/mapi/es2api/ABI-check
-+++ b/src/mapi/es2api/ABI-check
-@@ -6,7 +6,7 @@ set -eu
- # GL_EXT_multi_draw_arrays
- # GL_OES_EGL_image
- 
--LIB=${1-es2api/.libs/libGLESv2.so.2}
-+LIB=${1-es2api/.libs/cygGLESv2-2.dll}
- 
- if ! [ -f "$LIB" ]
- then
--- 
-2.15.0
-
diff --git a/patches/mesa-mesa/0006-Teach-es-1-2-api-ABI-check-shared-library-filenames-.patch b/patches/mesa-mesa/0006-Teach-es-1-2-api-ABI-check-shared-library-filenames-.patch
new file mode 100644
index 0000000..cc2027f
--- /dev/null
+++ b/patches/mesa-mesa/0006-Teach-es-1-2-api-ABI-check-shared-library-filenames-.patch
@@ -0,0 +1,73 @@
+From c910dcae9c6b4cd23c86b78700688ef4c01844bb Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Sat, 11 Nov 2017 14:48:10 +0000
+Subject: [PATCH] mapi: Teach es{1,2}api/ABI-check shared library names on
+ Cygwin
+
+Ideally we'd be able to get the library filename from libtool, but that
+doesn't seem to be a feature...
+
+Use of ${uname} is presumably ok here as we won't be running 'make check' if
+we are cross-compiling
+
+Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+---
+ src/mapi/es1api/ABI-check | 13 +++++++++----
+ src/mapi/es2api/ABI-check | 13 +++++++++----
+ 2 files changed, 18 insertions(+), 8 deletions(-)
+
+diff --git a/src/mapi/es1api/ABI-check b/src/mapi/es1api/ABI-check
+index 0a867343c79..b9ae5efafd8 100755
+--- a/src/mapi/es1api/ABI-check
++++ b/src/mapi/es1api/ABI-check
+@@ -9,12 +9,17 @@ set -eu
+ # or in extensions that are part of the ES 1.1 extension pack.
+ # (see http://www.khronos.org/registry/gles/specs/1.1/opengles_spec_1_1_extension_pack.pdf)
+ 
+-if [ $(uname) == "Darwin" ]
+-then
++case "$(uname)" in
++Darwin)
+   LIB=${1-es1api/.libs/libGLESv1_CM.dylib}
+-else
++  ;;
++CYGWIN*)
++  LIB=${1-es1api/.libs/cygGLESv1_CM-1.dll}
++  ;;
++*)
+   LIB=${1-es1api/.libs/libGLESv1_CM.so.1}
+-fi
++  ;;
++esac
+ 
+ if ! [ -f "$LIB" ]
+ then
+diff --git a/src/mapi/es2api/ABI-check b/src/mapi/es2api/ABI-check
+index 716e6679a49..7bc78480f76 100755
+--- a/src/mapi/es2api/ABI-check
++++ b/src/mapi/es2api/ABI-check
+@@ -6,12 +6,17 @@ set -eu
+ # GL_EXT_multi_draw_arrays
+ # GL_OES_EGL_image
+ 
+-if [ $(uname) == "Darwin" ]
+-then
++case "$(uname)" in
++Darwin)
+   LIB=${1-es2api/.libs/libGLESv2.dylib}
+-else
++  ;;
++CYGWIN*)
++  LIB=${1-es2api/.libs/cygGLESv2-2.dll}
++  ;;
++*)
+   LIB=${1-es2api/.libs/libGLESv2.so.2}
+-fi
++  ;;
++esac
+ 
+ if ! [ -f "$LIB" ]
+ then
+-- 
+2.15.0
+