Update patches

7 files changed, 171 insertions, 1 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index 27dd8a2..ccc3466 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -323,7 +323,7 @@ def BuilderList(slaves):
 
       autogenargs = {
                       'xserver'          : '--enable-xvfb --enable-xnest --enable-dmx --enable-kdrive --enable-xephyr --enable-xfake --disable-xfbdev --enable-xorg --enable-xwin --enable-xf86bigfont --enable-debug --disable-glamor',
-                      'mesa-mesa'        : '--disable-xa --with-gallium-drivers=swrast --disable-dri3 --disable-egl --enable-osmesa --enable-shared --disable-static --enable-driglx-direct --with-platforms=x11',
+                      'mesa-mesa'        : '--enable-autotools --disable-xa --with-gallium-drivers=swrast --disable-dri3 --disable-egl --enable-osmesa --enable-shared --disable-static --enable-driglx-direct --with-platforms=x11',
                       'mesa-demos'       : '--with-glut='+prefix,
                       'xf86-video-dummy' : '--disable-dga', # config check needs fixing to default to auto, not yes
                       'xts'              : '--disable-shared',
diff --git a/patches/libX11/0001-Add-include-needed-for-FIONREAD-on-Cygwin.patch b/patches/libX11/0001-Add-include-needed-for-FIONREAD-on-Cygwin.patch
new file mode 100644
index 0000000..99ac117
--- /dev/null
+++ b/patches/libX11/0001-Add-include-needed-for-FIONREAD-on-Cygwin.patch
@@ -0,0 +1,26 @@
+From a078fe9b51c5630d06344f58b24d547022258981 Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Wed, 13 Mar 2019 13:12:20 +0000
+Subject: [PATCH lib/libX11] Add include needed for FIONREAD on Cygwin
+
+---
+ src/XlibInt.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/XlibInt.c b/src/XlibInt.c
+index a0b2ed2f..56e37e2e 100644
+--- a/src/XlibInt.c
++++ b/src/XlibInt.c
+@@ -52,6 +52,9 @@ from The Open Group.
+ #include <sys/filio.h>
+ #endif
+ 
++/* Needed for FIONREAD on Cygwin */
++#include <sys/socket.h>
++
+ /* Needed for ioctl() on Solaris */
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+-- 
+2.17.0
+
diff --git a/patches/libpixman/0001-Disable-fence-image-self-test.patch b/patches/libpixman/0001-Disable-fence-image-self-test.patch
new file mode 100644
index 0000000..e9701d0
--- /dev/null
+++ b/patches/libpixman/0001-Disable-fence-image-self-test.patch
@@ -0,0 +1,26 @@
+From 6bd666404d937c71967a858c18c8d974ac3be16a Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu, 14 Mar 2019 15:30:03 +0000
+Subject: [PATCH] Disable fence-image-self-test
+
+This fails on Cygwin x86, apparently due to some bug in Cygwin related
+to a signal handler failing to be inherited properly by a fork child.
+---
+ test/Makefile.sources | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/test/Makefile.sources b/test/Makefile.sources
+index 0a56231..2e06816 100644
+--- a/test/Makefile.sources
++++ b/test/Makefile.sources
+@@ -3,7 +3,6 @@ TESTPROGRAMS =			      \
+ 	oob-test		      \
+ 	infinite-loop		      \
+ 	trap-crasher		      \
+-	fence-image-self-test	      \
+ 	region-translate-test	      \
+ 	fetch-test		      \
+ 	a1-trap-test		      \
+-- 
+2.17.0
+
diff --git a/patches/mesa-mesa-meson/0001-meson-Increase-timeout-for-glcpp-tests.patch b/patches/mesa-mesa-meson/0001-meson-Increase-timeout-for-glcpp-tests.patch
new file mode 100644
index 0000000..cb08926
--- /dev/null
+++ b/patches/mesa-mesa-meson/0001-meson-Increase-timeout-for-glcpp-tests.patch
@@ -0,0 +1,39 @@
+From 5facfdc02085d166fe69f93f0eaad02018732b2e Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu, 14 Mar 2019 00:15:47 +0000
+Subject: [PATCH] meson: Increase timeout for glcpp tests
+
+These take a little while, and can exceed the default 30s timeout on
+slow hardware.
+---
+ src/compiler/glsl/glcpp/meson.build      | 1 +
+ src/gallium/drivers/llvmpipe/meson.build | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build
+index 677baf1df10..5c0de869094 100644
+--- a/src/compiler/glsl/glcpp/meson.build
++++ b/src/compiler/glsl/glcpp/meson.build
+@@ -71,6 +71,7 @@ if with_any_opengl and with_tests
+         '--@0@'.format(m),
+       ],
+       suite : ['compiler', 'glcpp'],
++      timeout : 120,
+     )
+   endforeach
+ endif
+diff --git a/src/gallium/drivers/llvmpipe/meson.build b/src/gallium/drivers/llvmpipe/meson.build
+index 51562b10dc7..cfba38070c2 100644
+--- a/src/gallium/drivers/llvmpipe/meson.build
++++ b/src/gallium/drivers/llvmpipe/meson.build
+@@ -121,6 +121,7 @@ if with_tests and with_gallium_softpipe and with_llvm
+         link_with : [libllvmpipe, libgallium, libmesa_util],
+       ),
+       suite : ['llvmpipe'],
++      timeout : 120,
+     )
+   endforeach
+ endif
+-- 
+2.17.0
+
diff --git a/patches/mesa-mesa-meson/0002-Add-some-slop-to-u_format_test-for-8unorm-formats.patch b/patches/mesa-mesa-meson/0002-Add-some-slop-to-u_format_test-for-8unorm-formats.patch
new file mode 100644
index 0000000..e8d8265
--- /dev/null
+++ b/patches/mesa-mesa-meson/0002-Add-some-slop-to-u_format_test-for-8unorm-formats.patch
@@ -0,0 +1,28 @@
+From 0dcb1d0941303fbcb00620e2abd69e0f7a4b064e Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu, 14 Mar 2019 14:56:18 +0000
+Subject: [PATCH 2/2] Add some slop to u_format_test for 8unorm formats
+
+There seems to be some rounding ocurring here on my buildbot slave
+hardware.
+---
+ src/gallium/tests/unit/u_format_test.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/gallium/tests/unit/u_format_test.c b/src/gallium/tests/unit/u_format_test.c
+index 640214dfc50..102bbefb1cf 100644
+--- a/src/gallium/tests/unit/u_format_test.c
++++ b/src/gallium/tests/unit/u_format_test.c
+@@ -369,7 +369,8 @@ test_format_unpack_rgba_8unorm(const struct util_format_description *format_desc
+    for (i = 0; i < format_desc->block.height; ++i) {
+       for (j = 0; j < format_desc->block.width; ++j) {
+          for (k = 0; k < 4; ++k) {
+-            if (expected[i][j][k] != unpacked[i][j][k]) {
++            int error = abs(expected[i][j][k] - unpacked[i][j][k]);
++            if (error > 1) {
+                success = FALSE;
+             }
+          }
+-- 
+2.17.0
+
diff --git a/patches/xserver-meson/0001-meson-Fix-build-of-unit-tests.patch b/patches/xserver-meson/0001-meson-Fix-build-of-unit-tests.patch
new file mode 100644
index 0000000..73a01f7
--- /dev/null
+++ b/patches/xserver-meson/0001-meson-Fix-build-of-unit-tests.patch
@@ -0,0 +1,27 @@
+From 8dfe428e52c5d97f8de31f25630f30eafad3a9fe Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Mon, 17 Dec 2018 12:01:59 +0000
+Subject: [PATCH xserver] meson: Fix build of unit tests
+
+Fix build of unit tests when protocol headers are installed in a
+location which isn't on the include path by default
+---
+ test/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/meson.build b/test/meson.build
+index 89d8260ed..af1e841ac 100644
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -88,7 +88,7 @@ if build_xorg
+     unit = executable('tests',
+          unit_sources,
+          c_args: unit_defines,
+-         dependencies: pixman_dep,
++         dependencies: [pixman_dep, randrproto_dep, inputproto_dep],
+          include_directories: unit_includes,
+          link_args: ldwraps,
+          link_with: xorg_link,
+-- 
+2.17.0
+
diff --git a/patches/xserver-meson/0001-meson-Increase-timeout-for-unit-test.patch b/patches/xserver-meson/0001-meson-Increase-timeout-for-unit-test.patch
new file mode 100644
index 0000000..b03d4f3
--- /dev/null
+++ b/patches/xserver-meson/0001-meson-Increase-timeout-for-unit-test.patch
@@ -0,0 +1,24 @@
+From 2c903b2a54e5d54d6656d6da2aee55f5960bfa3f Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu, 14 Mar 2019 22:48:36 +0000
+Subject: [PATCH xserver] meson: Increase timeout for unit test
+
+Increase timeout for unit test
+---
+ test/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/meson.build b/test/meson.build
+index 26503ce0c..90048e05c 100644
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -94,5 +94,5 @@ if build_xorg
+          link_with: xorg_link,
+     )
+ 
+-    test('unit', unit)
++    test('unit', unit, timeout: 240)
+ endif
+-- 
+2.17.0
+