Update patches

4 files changed, 26 insertions, 68 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index e454ae2..43c3f61 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -359,7 +359,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-Fix-use-of-alloca-without-include-c99_alloca.h.patch' ],
+                                    '0003-Fix-vma-test-compilation-if-limits.h-defines-PAGE_SI.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' ],
@@ -369,7 +369,6 @@ def BuilderList(slaves):
                                       '0002-Bodge-GL-include-path.patch',
                                       '0003-Use-spawnl-rather-than-pipe-fork-to-invoke-xkbcomp.patch',
                                       '0004-Investigate-ignore-weirdness-with-request-length-tes.patch' ],
-                  'mesa-mesa-meson' : [ '0001-Fix-use-of-alloca-without-include-c99_alloca.h.patch' ],
 	        }
 
       if name in patches:
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
deleted file mode 100644
index 96ee3e7..0000000
--- a/patches/mesa-mesa-meson/0001-Fix-use-of-alloca-without-include-c99_alloca.h.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 8599fd9109d59adc541ab06570732776e2c098d6 Mon Sep 17 00:00:00 2001
-From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Tue, 3 Apr 2018 17:52:56 +0100
-Subject: [PATCH] Fix use of alloca() without #include <c99_alloca.h>
-
-Fix use of alloca() without #include <c99_alloca.h> in 1da345e5
-
-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/vbo/vbo_context.c | 1 +
- 1 file changed, 1 insertion(+)
-
-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 "main/mtypes.h"
- #include "main/bufferobj.h"
- #include "math/m_eval.h"
--- 
-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
deleted file mode 100644
index 96ee3e7..0000000
--- a/patches/mesa-mesa/0003-Fix-use-of-alloca-without-include-c99_alloca.h.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 8599fd9109d59adc541ab06570732776e2c098d6 Mon Sep 17 00:00:00 2001
-From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Tue, 3 Apr 2018 17:52:56 +0100
-Subject: [PATCH] Fix use of alloca() without #include <c99_alloca.h>
-
-Fix use of alloca() without #include <c99_alloca.h> in 1da345e5
-
-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/vbo/vbo_context.c | 1 +
- 1 file changed, 1 insertion(+)
-
-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 "main/mtypes.h"
- #include "main/bufferobj.h"
- #include "math/m_eval.h"
--- 
-2.16.2
-
diff --git a/patches/mesa-mesa/0003-Fix-vma-test-compilation-if-limits.h-defines-PAGE_SI.patch b/patches/mesa-mesa/0003-Fix-vma-test-compilation-if-limits.h-defines-PAGE_SI.patch
new file mode 100644
index 0000000..b050a12
--- /dev/null
+++ b/patches/mesa-mesa/0003-Fix-vma-test-compilation-if-limits.h-defines-PAGE_SI.patch
@@ -0,0 +1,25 @@
+From 6e056c422b20ad79e0e1a2f4b1f6485e028caab5 Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu, 5 Jul 2018 14:40:58 +0100
+Subject: [PATCH] Fix vma test compilation if limits.h defines PAGE_SIZE
+
+per SUS, limits.h may define PAGE_SIZE when the value is not indeterminate
+---
+ src/util/tests/vma/vma_random_test.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/util/tests/vma/vma_random_test.cpp b/src/util/tests/vma/vma_random_test.cpp
+index de887fead3..c08f3751a4 100644
+--- a/src/util/tests/vma/vma_random_test.cpp
++++ b/src/util/tests/vma/vma_random_test.cpp
+@@ -40,6 +40,7 @@
+ 
+ namespace {
+ 
++#undef PAGE_SIZE
+ static const uint64_t PAGE_SIZE = 4096;
+ 
+ struct allocation {
+-- 
+2.17.0
+