Update patches

4 files changed, 63 insertions, 56 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index 26c0208..8150022 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -358,7 +358,8 @@ 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' ],
+                                    '0002-megadriver-explicitly-link-against-glapi-link-with-n.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' ],
@@ -366,7 +367,7 @@ def BuilderList(slaves):
                   'xserver-meson' : [ '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-meson-libdrm-shouldn-t-appear-in-.pc-Requires.privat.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
new file mode 100644
index 0000000..00bd74c
--- /dev/null
+++ b/patches/mesa-mesa-meson/0001-Fix-use-of-alloca-without-include-c99_alloca.h.patch
@@ -0,0 +1,30 @@
+From 46a2c9bbd03234120594d50b48cbad73a355d240 Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Wed, 31 Jan 2018 12:46:22 +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
+
+Fix use of alloca() without #include <c99_alloca.h> in 29b9bd05
+
+../src/mesa/main/externalobjects.c:737:14: error: implicit declaration of function ‘alloca’ [-Werror=implicit-function-declaration]
+---
+ src/mesa/main/externalobjects.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.
+  */
+ 
++#include "c99_alloca.h"
+ #include "macros.h"
+ #include "mtypes.h"
+ #include "bufferobj.h"
+-- 
+2.16.1
+
diff --git a/patches/mesa-mesa-meson/0001-meson-libdrm-shouldn-t-appear-in-.pc-Requires.privat.patch b/patches/mesa-mesa-meson/0001-meson-libdrm-shouldn-t-appear-in-.pc-Requires.privat.patch
deleted file mode 100644
index 6388608..0000000
--- a/patches/mesa-mesa-meson/0001-meson-libdrm-shouldn-t-appear-in-.pc-Requires.privat.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 49e9789d23cfda47f1017fa30b1d7e3e41cd42e2 Mon Sep 17 00:00:00 2001
-From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Thu, 25 Jan 2018 18:53:08 +0000
-Subject: [PATCH] meson: libdrm shouldn't appear in .pc Requires.private: if it
- wasn't found
-
----
- meson.build                      | 6 ++++--
- src/mesa/drivers/dri/meson.build | 7 ++++++-
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index bc5996992a3..824e3c46bc5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1213,8 +1213,10 @@ inc_include = include_directories('include')
- 
- gl_priv_reqs = [
-   'x11', 'xext', 'xdamage >= 1.1', 'xfixes', 'x11-xcb', 'xcb',
--  'xcb-glx >= 1.8.1', 'libdrm >= 2.4.75',
--]
-+  'xcb-glx >= 1.8.1']
-+if dep_libdrm.found()
-+  gl_priv_reqs += 'libdrm >= 2.4.75'
-+endif
- if dep_xxf86vm != [] and dep_xxf86vm.found()
-   gl_priv_reqs += 'xxf86vm'
- endif
-diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
-index 94798b0f5da..87021fba885 100644
---- a/src/mesa/drivers/dri/meson.build
-+++ b/src/mesa/drivers/dri/meson.build
-@@ -67,12 +67,17 @@ endif
- # This needs to be installed if any dri drivers (including gallium dri drivers)
- # are built.
- if with_dri
-+  dri_req_private = []
-+  if dep_libdrm.found()
-+    dri_req_private = ['libdrm >= 2.4.75']  # FIXME: don't hardcode this
-+  endif
-+
-   pkg.generate(
-     name : 'dri',
-     filebase : 'dri',
-     description : 'Direct Rendering Infrastructure',
-     version : meson.project_version(),
-     variables : ['dridriverdir=${prefix}/' + dri_drivers_path],
--    requires_private : ['libdrm >= 2.4.75'],  # FIXME: don't hardcode this
-+    requires_private : dri_req_private,
-   )
- endif
--- 
-2.15.1
-
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..00bd74c
--- /dev/null
+++ b/patches/mesa-mesa/0003-Fix-use-of-alloca-without-include-c99_alloca.h.patch
@@ -0,0 +1,30 @@
+From 46a2c9bbd03234120594d50b48cbad73a355d240 Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Wed, 31 Jan 2018 12:46:22 +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
+
+Fix use of alloca() without #include <c99_alloca.h> in 29b9bd05
+
+../src/mesa/main/externalobjects.c:737:14: error: implicit declaration of function ‘alloca’ [-Werror=implicit-function-declaration]
+---
+ src/mesa/main/externalobjects.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.
+  */
+ 
++#include "c99_alloca.h"
+ #include "macros.h"
+ #include "mtypes.h"
+ #include "bufferobj.h"
+-- 
+2.16.1
+