Update patches

3 files changed, 64 insertions, 31 deletions

diff --git a/patches/mesa-mesa/0001-Fix-util-process-test-on-Cygwin.patch b/patches/mesa-mesa/0001-Fix-util-process-test-on-Cygwin.patch
deleted file mode 100644
index e03b8af..0000000
--- a/patches/mesa-mesa/0001-Fix-util-process-test-on-Cygwin.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d1ea57acca6f088d7b7931b93108659e8611fc51 Mon Sep 17 00:00:00 2001
-From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Wed, 25 Mar 2020 13:22:30 +0000
-Subject: [PATCH] Fix util/process test on Cygwin
-
-It seems meson returns the filename with extension for full_path(), even
-though Cygwin does it's best to pretend the file doesn't have that
-extension.
----
- src/util/process_test.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/util/process_test.c b/src/util/process_test.c
-index 708c2766eb9..5a9fc2ef85c 100644
---- a/src/util/process_test.c
-+++ b/src/util/process_test.c
-@@ -70,6 +70,11 @@ test_util_get_process_exec_path (void)
-       error = true;
-       return;
-    }
-+#ifdef __CYGWIN__
-+   int i = strlen(build_path) - 4;
-+   if ((i > 0) && (strcmp(&build_path[i], ".exe") == 0))
-+      build_path[i] = 0;
-+#endif 
-    expect_equal_str(build_path, path, "util_get_process_name");
- }
- 
--- 
-2.21.0
-
diff --git a/patches/mesa-mesa/0001-glthread-Fix-use-of-alloca-without-include-c99_alloc.patch b/patches/mesa-mesa/0001-glthread-Fix-use-of-alloca-without-include-c99_alloc.patch
new file mode 100644
index 0000000..5341a2a
--- /dev/null
+++ b/patches/mesa-mesa/0001-glthread-Fix-use-of-alloca-without-include-c99_alloc.patch
@@ -0,0 +1,39 @@
+From f3532a31b5ab188a1db34cc4a50079ec57a6df6a Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Wed, 6 May 2020 16:09:56 +0100
+Subject: [PATCH] glthread: 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/glthread_draw.c: In function ‘_mesa_marshal_MultiDrawElementsBaseVertex’:
+../src/mesa/main/glthread_draw.c:812:36: error: implicit declaration of function ‘alloca’; did you mean ‘malloc’? [-Werror=implicit-function-declaration]
+  812 |       const GLvoid **out_indices = alloca(sizeof(indices[0]) * draw_count);
+      |                                    ^~~~~~
+      |                                    malloc
+../src/mesa/main/glthread_draw.c:812:36: error: initialization of ‘const GLvoid **’ {aka ‘const void **’} from ‘int’ makes pointer from integer without a cast [-Werror=int-conversion]
+cc1: some warnings being treated as errors
+
+Include c99_alloca.h to portably make the alloca() prototype available.
+
+Fixes: 2840bc30
+---
+ src/mesa/main/glthread_draw.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/mesa/main/glthread_draw.c b/src/mesa/main/glthread_draw.c
+index 3ed75e470bd..8e6aeca002a 100644
+--- a/src/mesa/main/glthread_draw.c
++++ b/src/mesa/main/glthread_draw.c
+@@ -27,6 +27,8 @@
+  * index data, so that glthread doesn't have to execute synchronously.
+  */
+ 
++#include "c99_alloca.h"
++
+ #include "main/glthread_marshal.h"
+ #include "main/dispatch.h"
+ #include "main/varray.h"
+-- 
+2.21.0
+
diff --git a/patches/xserver-meson/0001-hw-xwin-Fix-build-of-xwinclip-tool-when-xcb-is-insta.patch b/patches/xserver-meson/0001-hw-xwin-Fix-build-of-xwinclip-tool-when-xcb-is-insta.patch
new file mode 100644
index 0000000..64ae9ec
--- /dev/null
+++ b/patches/xserver-meson/0001-hw-xwin-Fix-build-of-xwinclip-tool-when-xcb-is-insta.patch
@@ -0,0 +1,25 @@
+From c580d482aafa439a14982110b1be1a54914a8084 Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Wed, 6 May 2020 16:55:43 +0100
+Subject: [PATCH xserver] hw/xwin: Fix build of xwinclip tool when xcb is
+ installed in non-default location
+
+---
+ hw/xwin/winclipboard/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hw/xwin/winclipboard/meson.build b/hw/xwin/winclipboard/meson.build
+index c239f5325..89be28dd6 100644
+--- a/hw/xwin/winclipboard/meson.build
++++ b/hw/xwin/winclipboard/meson.build
+@@ -27,6 +27,7 @@ srcs_xwinclip = [
+ executable(
+     'xwinclip',
+     srcs_xwinclip,
++    dependencies: dependency('xcb'),
+     link_with: xwin_clipboard,
+     link_args: ['-lgdi32', '-lpthread'],
+     install: true,
+-- 
+2.21.0
+