Update patches

3 files changed, 75 insertions, 38 deletions

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
deleted file mode 100644
index b050a12..0000000
--- a/patches/mesa-mesa/0003-Fix-vma-test-compilation-if-limits.h-defines-PAGE_SI.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-
diff --git a/patches/xserver-meson/0004-Investigate-ignore-weirdness-with-request-length-tes.patch b/patches/xserver-meson/0004-Investigate-ignore-weirdness-with-request-length-tes.patch
index 60a2de1..2bef380 100644
--- a/patches/xserver-meson/0004-Investigate-ignore-weirdness-with-request-length-tes.patch
+++ b/patches/xserver-meson/0004-Investigate-ignore-weirdness-with-request-length-tes.patch
@@ -1,26 +1,33 @@
-From ea10b21736ead8b705058eb1b92cf5d2c301b3a6 Mon Sep 17 00:00:00 2001
+From 34c62cb8e6b9f487a74e09748dce5b437cd1cd73 Mon Sep 17 00:00:00 2001
 From: Jon Turney <jon.turney@dronecode.org.uk>
 Date: Fri, 12 Jan 2018 14:01:39 +0000
-Subject: [PATCH xserver 3/3] Investigate/ignore weirdness with request-length
- test on x86
+Subject: [PATCH xserver] Investigate/ignore weirdness with request-length test
+ on x86
 
 ---
- test/bigreq/request-length.c |  4 ++++
+ test/bigreq/request-length.c |  8 ++++++--
  test/simple-xinit.c          | 14 +++++++++++++-
- 2 files changed, 17 insertions(+), 1 deletion(-)
+ 2 files changed, 19 insertions(+), 3 deletions(-)
 
 diff --git a/test/bigreq/request-length.c b/test/bigreq/request-length.c
-index 8174813ae..90083a877 100644
+index 8174813ae..84afb4cbf 100644
 --- a/test/bigreq/request-length.c
 +++ b/test/bigreq/request-length.c
-@@ -97,5 +97,9 @@ int main(int argc, char **argv)
+@@ -92,10 +92,14 @@ int main(int argc, char **argv)
+         error.error_code == 2 /* BadValue */  &&
+         error.major_code == xise_req.extension &&
+         error.minor_code == XCB_INPUT_XI_SELECT_EVENTS)
+-        return 1; /* Our request was processed, which shouldn't happen */
++        return 0; /* happens on x86 */
++        /* return 1; */ /* Our request was processed, which shouldn't happen */
++
++    /* end-of-file */
++    if (r == 0)
++        return 0;
+ 
      /* Something else bad happened. We got something back but it's not the
       * error we expected. If this happens, it needs to be investigated. */
- 
-+#ifdef _X86_
-+    return 0;
-+#endif
-+
+-
      return 2;
  }
 diff --git a/test/simple-xinit.c b/test/simple-xinit.c
@@ -72,5 +79,5 @@ index 26ff12bf7..5b34a1631 100644
      exit(ret);
  }
 -- 
-2.15.1
+2.17.0
 
diff --git a/patches/xserver-meson/0005-Additional-error-reporting-in-simple-xinit.patch b/patches/xserver-meson/0005-Additional-error-reporting-in-simple-xinit.patch
new file mode 100644
index 0000000..cf04446
--- /dev/null
+++ b/patches/xserver-meson/0005-Additional-error-reporting-in-simple-xinit.patch
@@ -0,0 +1,55 @@
+From 957c21546752916952f6505f7e0913fc6115c46b Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu, 2 Aug 2018 19:34:44 +0100
+Subject: [PATCH xserver] Additional error reporting in simple-xinit
+
+---
+ test/bigreq/request-length.c | 8 ++++++++
+ test/simple-xinit.c          | 4 +++-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/test/bigreq/request-length.c b/test/bigreq/request-length.c
+index 8174813ae..d9938f709 100644
+--- a/test/bigreq/request-length.c
++++ b/test/bigreq/request-length.c
+@@ -23,6 +23,7 @@
+ 
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <stdio.h>
+ #include <poll.h>
+ #include <xcb/xcb.h>
+ #include <xcb/bigreq.h>
+@@ -31,6 +32,13 @@
+ int main(int argc, char **argv)
+ {
+     xcb_connection_t *c = xcb_connect(NULL, NULL);
++
++    int e = xcb_connection_has_error(c);
++    if (e) {
++        fprintf(stderr, "connection has error %d\n", e);
++        return e;
++    }
++
+     int fd = xcb_get_file_descriptor(c);
+ 
+     struct {
+diff --git a/test/simple-xinit.c b/test/simple-xinit.c
+index 26ff12bf7..66c9a44b3 100644
+--- a/test/simple-xinit.c
++++ b/test/simple-xinit.c
+@@ -133,8 +133,10 @@ start_client(char *const *client_args, int display)
+             return 1;
+         }
+ 
+-        if (!WIFEXITED(wstatus))
++        if (!WIFEXITED(wstatus)) {
++            fprintf(stderr, "Client stopped or terminated by signal %d\n", WTERMSIG(wstatus));
+             return 1;
++        }
+ 
+         return WEXITSTATUS(wstatus);
+     } else {
+-- 
+2.17.0
+