Update mesa patches

3 files changed, 32 insertions, 30 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index ab82846..cc280d0 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',
-                                    '0003-Also-include-endian.h-on-cygwin.patch' ],
+                                    '0003-Fix-use-of-alloca-without-include-c99_alloca.h.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
deleted file mode 100644
index 9429154..0000000
--- a/patches/mesa-mesa/0003-Also-include-endian.h-on-cygwin.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/0003-Fix-use-of-alloca-without-include-c99_alloca.h.patch b/patches/mesa-mesa/0003-Fix-use-of-alloca-without-include-c99_alloca.h.patch
new file mode 100644
index 0000000..a16c05f
--- /dev/null
+++ b/patches/mesa-mesa/0003-Fix-use-of-alloca-without-include-c99_alloca.h.patch
@@ -0,0 +1,31 @@
+From 3b00c72a92ca1091d11ecffd8db404dcd598e63d Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Wed, 13 Dec 2017 19:49:07 +0000
+Subject: [PATCH] Fix use of alloca() without #include <c99_alloca.h>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+../../../src/mesa/main/shaderapi.c: In function ‘_mesa_ShaderBinary’:
+../../../src/mesa/main/shaderapi.c:2188:9: error: implicit declaration of function ‘alloca’ [-Werror=implicit-function-declaration]
+
+Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+---
+ src/mesa/main/shaderapi.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
+index d824a88ca2f..2c11e4d5bb6 100644
+--- a/src/mesa/main/shaderapi.c
++++ b/src/mesa/main/shaderapi.c
+@@ -38,6 +38,7 @@
+ 
+ 
+ #include <stdbool.h>
++#include <c99_alloca.h>
+ #include "main/glheader.h"
+ #include "main/context.h"
+ #include "main/dispatch.h"
+-- 
+2.15.1
+