Update patches

3 files changed, 33 insertions, 101 deletions

diff --git a/patches/mesa-mesa/0001-Disable-export-symbols-check-test.patch b/patches/mesa-mesa/0001-Disable-export-symbols-check-test.patch
new file mode 100644
index 0000000..4763f63
--- /dev/null
+++ b/patches/mesa-mesa/0001-Disable-export-symbols-check-test.patch
@@ -0,0 +1,33 @@
+From eb442289fc452773bf5f0377e412abb7e0860c03 Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu, 11 Jul 2019 14:33:03 +0100
+Subject: [PATCH] Disable export symbols check test
+
+---
+ bin/symbols-check.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/bin/symbols-check.py b/bin/symbols-check.py
+index b8562c83b5d..5dcbd7324ec 100644
+--- a/bin/symbols-check.py
++++ b/bin/symbols-check.py
+@@ -3,6 +3,7 @@
+ import argparse
+ import subprocess
+ import os
++import platform
+ 
+ # This list contains symbols that _might_ be exported for some platforms
+ PLATFORM_SYMBOLS = [
+@@ -112,4 +113,8 @@ def main():
+ 
+ 
+ if __name__ == '__main__':
++    # disable this test on cygwin until it works :)
++    if platform.system().startswith('CYGWIN'):
++        exit(0)
++
+     main()
+-- 
+2.21.0
+
diff --git a/patches/mesa-mesa/0003-glx-windows-Fix-compilation-with-Werror-format.patch b/patches/mesa-mesa/0003-glx-windows-Fix-compilation-with-Werror-format.patch
deleted file mode 100644
index 8e244b9..0000000
--- a/patches/mesa-mesa/0003-glx-windows-Fix-compilation-with-Werror-format.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 0366f8c69011ed7081a42b80a5c20fc65f777c3e Mon Sep 17 00:00:00 2001
-From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Thu, 6 Jun 2019 16:44:08 +0100
-Subject: [PATCH] glx/windows: Fix compilation with -Werror-format
-
-Fix compilation where the DWORD type is used with a format, after
--Werror-format added by c9c1e261.
-
-Some Win32 API types are different fundamental types in the 32-bit and
-64-bit versions. This problem is then further compounded by the fact
-that whilst both 32-bit Cygwin and 32-bit MinGW use the ILP32 data
-model, 64-bit MinGW uses the LLP64 data model, but 64-bit Cygwin uses
-the LP64 data model. This makes it near impossible to write printf
-format specifiers which are correct for all those targets.
-
-In the Win32 API, DWORD is an unsigned, 32-bit type.  So, it is defined
-in terms of an unsigned long, except in the LP64 data model used by
-64-bit Cygwin, where it is an unsigned int.
-
-It should always be safe to cast it to unsigned int and use %u or %x.
----
- src/glx/windows/windows_drawable.c | 6 +++---
- src/glx/windows/windowsgl.c        | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/glx/windows/windows_drawable.c b/src/glx/windows/windows_drawable.c
-index 3d8227d3b7d..d1d79572b87 100644
---- a/src/glx/windows/windows_drawable.c
-+++ b/src/glx/windows/windows_drawable.c
-@@ -124,10 +124,10 @@ windows_create_drawable(int type, void *handle)
-       d->callbacks = &pixmap_callbacks;
- 
-       // Access file mapping object by a name
--      snprintf(name, sizeof(name), "Local\\CYGWINX_WINDOWSDRI_%08lx", (uintptr_t)handle);
-+      snprintf(name, sizeof(name), "Local\\CYGWINX_WINDOWSDRI_%08x", (unsigned int)(uintptr_t)handle);
-       d->hSection = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, name);
-       if (!d->hSection)
--         printf("OpenFileMapping failed %x\n", GetLastError());
-+         printf("OpenFileMapping failed %x\n", (int)GetLastError());
- 
-       // Create a screen-compatible DC
-       d->dibDC = CreateCompatibleDC(NULL);
-@@ -135,7 +135,7 @@ windows_create_drawable(int type, void *handle)
-       // Map the shared memory section to access the BITMAPINFOHEADER
-       pBmpHeader = (BITMAPINFOHEADER *)MapViewOfFile(d->hSection, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(BITMAPINFOHEADER));
-       if (!pBmpHeader)
--         printf("MapViewOfFile failed %x\n", GetLastError());
-+         printf("MapViewOfFile failed %x\n", (int)GetLastError());
- 
-       // Create a DIB using the file mapping
-       d->hDIB = CreateDIBSection(d->dibDC, (BITMAPINFO *) pBmpHeader,
-diff --git a/src/glx/windows/windowsgl.c b/src/glx/windows/windowsgl.c
-index 56849da8371..73366b20ab8 100644
---- a/src/glx/windows/windowsgl.c
-+++ b/src/glx/windows/windowsgl.c
-@@ -217,7 +217,7 @@ int windows_bind_context(windowsContext *context, windowsDrawable *draw, windows
-       read->callbacks->releasedc(read, readDc);
- 
-       if (!ret) {
--         printf("wglMakeContextCurrentARB error: %08x\n", GetLastError());
-+         printf("wglMakeContextCurrentARB error: %08x\n", (int)GetLastError());
-          return FALSE;
-       }
-    }
-@@ -226,7 +226,7 @@ int windows_bind_context(windowsContext *context, windowsDrawable *draw, windows
-       /* Otherwise, just use wglMakeCurrent */
-       BOOL ret = wglMakeCurrent(drawDc, context->ctx);
-       if (!ret) {
--         printf("wglMakeCurrent error: %08x\n", GetLastError());
-+         printf("wglMakeCurrent error: %08x\n", (int)GetLastError());
-          return FALSE;
-       }
-    }
--- 
-2.21.0
-
diff --git a/patches/mesa-mesa/0004-Fix-Werror-format-with-unit64_t-in-graw-test.patch b/patches/mesa-mesa/0004-Fix-Werror-format-with-unit64_t-in-graw-test.patch
deleted file mode 100644
index f6cbc04..0000000
--- a/patches/mesa-mesa/0004-Fix-Werror-format-with-unit64_t-in-graw-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 846018909f51ce55e80ab84cbde7dd69591f6901 Mon Sep 17 00:00:00 2001
-From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Thu, 6 Jun 2019 17:40:10 +0100
-Subject: [PATCH] Fix -Werror=format with unit64_t in graw test
-
----
- src/gallium/tests/graw/occlusion-query.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gallium/tests/graw/occlusion-query.c b/src/gallium/tests/graw/occlusion-query.c
-index 444b645cacc..b104ace8b35 100644
---- a/src/gallium/tests/graw/occlusion-query.c
-+++ b/src/gallium/tests/graw/occlusion-query.c
-@@ -187,7 +187,7 @@ draw(void)
-    info.ctx->get_query_result(info.ctx, q1, TRUE, &res1);
-    info.ctx->get_query_result(info.ctx, q2, TRUE, &res2);
- 
--   printf("result1 = %lu  result2 = %lu\n", res1.u64, res2.u64);
-+   printf("result1 = %lu  result2 = %lu\n", (unsigned long int)res1.u64, (unsigned long int)res2.u64);
-    if (res1.u64 < expected1_min || res1.u64 > expected1_max)
-       printf("  Failure: result1 should be near %d\n", expected1);
-    if (res2.u64 < expected2_min || res2.u64 > expected2_max)
--- 
-2.21.0
-