Update mesa patches

3 files changed, 30 insertions, 74 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index a90b66f..ab82846 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',
-                                    '0006-Teach-es-1-2-api-ABI-check-shared-library-filenames-.patch' ],
+                                    '0003-Also-include-endian.h-on-cygwin.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/0003-Also-include-endian.h-on-cygwin.patch b/patches/mesa-mesa/0003-Also-include-endian.h-on-cygwin.patch
new file mode 100644
index 0000000..9429154
--- /dev/null
+++ b/patches/mesa-mesa/0003-Also-include-endian.h-on-cygwin.patch
@@ -0,0 +1,29 @@
+From e5c6197bdb4dec926ab31534b8533dd1bf14dfa1 Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Mon, 27 Nov 2017 13:32:53 +0000
+Subject: [PATCH] Also include endian.h on cygwin
+
+If u_endian.h can't determine the endianess, the default behaviour in sha1.c
+is to build for big-endian
+
+Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+---
+ src/util/u_endian.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/util/u_endian.h b/src/util/u_endian.h
+index 50f94c578ed..22d011ec008 100644
+--- a/src/util/u_endian.h
++++ b/src/util/u_endian.h
+@@ -27,7 +27,7 @@
+ #ifndef U_ENDIAN_H
+ #define U_ENDIAN_H
+ 
+-#if defined(__GLIBC__) || defined(ANDROID)
++#if defined(__GLIBC__) || defined(ANDROID) || defined(__CYGWIN__)
+ #include <endian.h>
+ 
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+-- 
+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
deleted file mode 100644
index cc2027f..0000000
--- a/patches/mesa-mesa/0006-Teach-es-1-2-api-ABI-check-shared-library-filenames-.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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
-