Update patches

2 files changed, 42 insertions, 36 deletions

diff --git a/patches/mesa-mesa-meson/0001-Fix-use-of-alloca-without-include-c99_alloca.h.patch b/patches/mesa-mesa-meson/0001-Fix-use-of-alloca-without-include-c99_alloca.h.patch
index 00bd74c..96ee3e7 100644
--- a/patches/mesa-mesa-meson/0001-Fix-use-of-alloca-without-include-c99_alloca.h.patch
+++ b/patches/mesa-mesa-meson/0001-Fix-use-of-alloca-without-include-c99_alloca.h.patch
@@ -1,30 +1,33 @@
-From 46a2c9bbd03234120594d50b48cbad73a355d240 Mon Sep 17 00:00:00 2001
+From 8599fd9109d59adc541ab06570732776e2c098d6 Mon Sep 17 00:00:00 2001
 From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Wed, 31 Jan 2018 12:46:22 +0000
+Date: Tue, 3 Apr 2018 17:52:56 +0100
 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
 
-Fix use of alloca() without #include <c99_alloca.h> in 29b9bd05
+Fix use of alloca() without #include <c99_alloca.h> in 1da345e5
 
-../src/mesa/main/externalobjects.c:737:14: error: implicit declaration of function ‘alloca’ [-Werror=implicit-function-declaration]
+vbo/vbo_context.c: In function '_vbo_draw_indirect':
+vbo/vbo_context.c:284:34: error: implicit declaration of function 'alloca' [-Werror=implicit-function-declaration]
+       struct _mesa_prim *space = alloca(draw_count*sizeof(struct _mesa_prim));
+                                  ^~~~~~
+vbo/vbo_context.c:284:34: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
+
+Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
 ---
- src/mesa/main/externalobjects.c | 1 +
+ src/mesa/vbo/vbo_context.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/src/mesa/main/externalobjects.c b/src/mesa/main/externalobjects.c
-index 463debd268..4648932a9b 100644
---- a/src/mesa/main/externalobjects.c
-+++ b/src/mesa/main/externalobjects.c
-@@ -21,6 +21,7 @@
-  * DEALINGS IN THE SOFTWARE.
+diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c
+index e50cee7a8c..f698fd0f41 100644
+--- a/src/mesa/vbo/vbo_context.c
++++ b/src/mesa/vbo/vbo_context.c
+@@ -25,6 +25,7 @@
+  *    Keith Whitwell <keithw@vmware.com>
   */
  
 +#include "c99_alloca.h"
- #include "macros.h"
- #include "mtypes.h"
- #include "bufferobj.h"
+ #include "main/mtypes.h"
+ #include "main/bufferobj.h"
+ #include "math/m_eval.h"
 -- 
-2.16.1
+2.16.2
 
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
index 00bd74c..96ee3e7 100644
--- 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
@@ -1,30 +1,33 @@
-From 46a2c9bbd03234120594d50b48cbad73a355d240 Mon Sep 17 00:00:00 2001
+From 8599fd9109d59adc541ab06570732776e2c098d6 Mon Sep 17 00:00:00 2001
 From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Wed, 31 Jan 2018 12:46:22 +0000
+Date: Tue, 3 Apr 2018 17:52:56 +0100
 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
 
-Fix use of alloca() without #include <c99_alloca.h> in 29b9bd05
+Fix use of alloca() without #include <c99_alloca.h> in 1da345e5
 
-../src/mesa/main/externalobjects.c:737:14: error: implicit declaration of function ‘alloca’ [-Werror=implicit-function-declaration]
+vbo/vbo_context.c: In function '_vbo_draw_indirect':
+vbo/vbo_context.c:284:34: error: implicit declaration of function 'alloca' [-Werror=implicit-function-declaration]
+       struct _mesa_prim *space = alloca(draw_count*sizeof(struct _mesa_prim));
+                                  ^~~~~~
+vbo/vbo_context.c:284:34: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
+
+Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
 ---
- src/mesa/main/externalobjects.c | 1 +
+ src/mesa/vbo/vbo_context.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/src/mesa/main/externalobjects.c b/src/mesa/main/externalobjects.c
-index 463debd268..4648932a9b 100644
---- a/src/mesa/main/externalobjects.c
-+++ b/src/mesa/main/externalobjects.c
-@@ -21,6 +21,7 @@
-  * DEALINGS IN THE SOFTWARE.
+diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c
+index e50cee7a8c..f698fd0f41 100644
+--- a/src/mesa/vbo/vbo_context.c
++++ b/src/mesa/vbo/vbo_context.c
+@@ -25,6 +25,7 @@
+  *    Keith Whitwell <keithw@vmware.com>
   */
  
 +#include "c99_alloca.h"
- #include "macros.h"
- #include "mtypes.h"
- #include "bufferobj.h"
+ #include "main/mtypes.h"
+ #include "main/bufferobj.h"
+ #include "math/m_eval.h"
 -- 
-2.16.1
+2.16.2