From b22198069590ad438da0b437faeb4480968edfae Mon Sep 17 00:00:00 2001 From: Buildbot system user Date: Thu, 11 Jul 2019 10:37:24 +0000 Subject: Update patches --- ...indows-Fix-compilation-with-Werror-format.patch | 76 +++++++++++++++++++ ...orce-.so-extension-for-megadriver-modules.patch | 85 ---------------------- ...-Werror-format-with-unit64_t-in-graw-test.patch | 25 +++++++ .../0001-Disable-some-rendercheck-tests.patch | 45 ++++++++---- .../0001-meson-Fix-build-of-unit-tests.patch | 27 ------- ...006-Revert-meson-Fix-libshadow.so-linkage.patch | 26 +++++++ 6 files changed, 158 insertions(+), 126 deletions(-) create mode 100644 patches/mesa-mesa/0003-glx-windows-Fix-compilation-with-Werror-format.patch delete mode 100644 patches/mesa-mesa/0003-meson-Force-.so-extension-for-megadriver-modules.patch create mode 100644 patches/mesa-mesa/0004-Fix-Werror-format-with-unit64_t-in-graw-test.patch delete mode 100644 patches/xserver-meson/0001-meson-Fix-build-of-unit-tests.patch create mode 100644 patches/xserver-meson/0006-Revert-meson-Fix-libshadow.so-linkage.patch 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 new file mode 100644 index 0000000..8e244b9 --- /dev/null +++ b/patches/mesa-mesa/0003-glx-windows-Fix-compilation-with-Werror-format.patch @@ -0,0 +1,76 @@ +From 0366f8c69011ed7081a42b80a5c20fc65f777c3e Mon Sep 17 00:00:00 2001 +From: Jon Turney +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/0003-meson-Force-.so-extension-for-megadriver-modules.patch b/patches/mesa-mesa/0003-meson-Force-.so-extension-for-megadriver-modules.patch deleted file mode 100644 index 5397aa7..0000000 --- a/patches/mesa-mesa/0003-meson-Force-.so-extension-for-megadriver-modules.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 43c96ce6768f855fdb0cb9647fb12d14bafe47bc Mon Sep 17 00:00:00 2001 -From: Jon Turney -Date: Sun, 14 Apr 2019 20:46:39 +0100 -Subject: [PATCH] meson: Force '.so' extension for megadriver modules - -DRI driver loadable modules are always installed with -install_megadriver.py with names ending with '.so', irrespective of -platform. - -Force the name the loadable module is built with to match, so -install_megadriver.py doesn't spin trying to remove non-existent -symlinks. - -Fixes: c77acc3c "meson: remove meson-created megadrivers symlinks" ---- - src/gallium/targets/dri/meson.build | 1 + - src/gallium/targets/va/meson.build | 1 + - src/gallium/targets/vdpau/meson.build | 1 + - src/gallium/targets/xvmc/meson.build | 1 + - src/mesa/drivers/dri/meson.build | 1 + - 5 files changed, 5 insertions(+) - -diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build -index 5b4b4bc1ab7..dd40969a166 100644 ---- a/src/gallium/targets/dri/meson.build -+++ b/src/gallium/targets/dri/meson.build -@@ -63,6 +63,7 @@ libgallium_dri = shared_library( - # Will be deleted during installation, see install_megadrivers.py - install : true, - install_dir : dri_drivers_path, -+ name_suffix : 'so', - ) - - foreach d : [[with_gallium_kmsro, [ -diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build -index 827cfb8d829..4bfb5cbab7a 100644 ---- a/src/gallium/targets/va/meson.build -+++ b/src/gallium/targets/va/meson.build -@@ -52,6 +52,7 @@ libva_gallium = shared_library( - # Will be deleted during installation, see install_megadrivers.py - install : true, - install_dir : va_drivers_path, -+ name_suffix : 'so', - ) - - foreach d : [[with_gallium_r600, 'r600'], -diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build -index 3017721bda0..48f01ffba6c 100644 ---- a/src/gallium/targets/vdpau/meson.build -+++ b/src/gallium/targets/vdpau/meson.build -@@ -58,6 +58,7 @@ libvdpau_gallium = shared_library( - # Will be deleted during installation, see install_megadrivers.py - install : true, - install_dir : vdpau_drivers_path, -+ name_suffix : 'so', - ) - foreach d : [[with_gallium_r300, 'r300'], - [with_gallium_r600, 'r600'], -diff --git a/src/gallium/targets/xvmc/meson.build b/src/gallium/targets/xvmc/meson.build -index 845f3a421b7..537275aab57 100644 ---- a/src/gallium/targets/xvmc/meson.build -+++ b/src/gallium/targets/xvmc/meson.build -@@ -50,6 +50,7 @@ libxvmc_gallium = shared_library( - # Will be deleted during installation, see install_megadrivers.py - install : true, - install_dir : xvmc_drivers_path, -+ name_suffix : 'so', - ) - - foreach d : [[with_gallium_r600, 'r600'], [with_gallium_nouveau, 'nouveau']] -diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build -index a0f47bbecee..dddc4ae3dfd 100644 ---- a/src/mesa/drivers/dri/meson.build -+++ b/src/mesa/drivers/dri/meson.build -@@ -57,6 +57,7 @@ if dri_drivers != [] - # Will be deleted during installation, see install_megadrivers.py - install : true, - install_dir : dri_drivers_path, -+ name_suffix : 'so', - ) - - meson.add_install_script( --- -2.17.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 new file mode 100644 index 0000000..f6cbc04 --- /dev/null +++ b/patches/mesa-mesa/0004-Fix-Werror-format-with-unit64_t-in-graw-test.patch @@ -0,0 +1,25 @@ +From 846018909f51ce55e80ab84cbde7dd69591f6901 Mon Sep 17 00:00:00 2001 +From: Jon Turney +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 + diff --git a/patches/xserver-meson/0001-Disable-some-rendercheck-tests.patch b/patches/xserver-meson/0001-Disable-some-rendercheck-tests.patch index 70f5c9e..ba3f32a 100644 --- a/patches/xserver-meson/0001-Disable-some-rendercheck-tests.patch +++ b/patches/xserver-meson/0001-Disable-some-rendercheck-tests.patch @@ -1,4 +1,4 @@ -From 6f350a5e5c15aa777471335b0b0b9a84ef4142ff Mon Sep 17 00:00:00 2001 +From 17a716a7ca6469ab8d8be68429c9f17e151d2a20 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Tue, 16 Apr 2019 22:32:03 +0100 Subject: [PATCH xserver] Disable some rendercheck tests @@ -6,36 +6,53 @@ Subject: [PATCH xserver] Disable some rendercheck tests Disable some rendercheck tests which fail on Cygwin x86 (some kind of maths/rounding issue, perhaps) --- - test/meson.build | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + test/meson.build | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/meson.build b/test/meson.build -index 35c77bfea..434e281c4 100644 +index 35c77bfea..87f3f5be9 100644 --- a/test/meson.build +++ b/test/meson.build -@@ -11,17 +11,17 @@ piglit_env.set('XSERVER_BUILDDIR', meson.build_root()) +@@ -10,19 +10,19 @@ piglit_env.set('XSERVER_BUILDDIR', meson.build_root()) + some_ops = ' -o clear,src,dst,over,xor,disjointover' rendercheck_tests = [ - ['blend/All/a8r8g8b8', '-t blend -f a8r8g8b8'], +- ['blend/All/a8r8g8b8', '-t blend -f a8r8g8b8'], - ['blend/All/x8r8g8b8', '-t blend -f a8r8g8b8,x8r8g8b8'], ++# ['blend/All/a8r8g8b8', '-t blend -f a8r8g8b8'], +# ['blend/All/x8r8g8b8', '-t blend -f a8r8g8b8,x8r8g8b8'], ['blend/All/a2r10g10b10', '-t blend -f a8r8g8b8,a2r10g10b10'], ['blend/Clear', '-t blend -o clear'], - ['blend/Src', '-t blend -o src'], - ['blend/Over', '-t blend -o over'], +- ['composite/Some/a8r8g8b8', '-t composite -f a8r8g8b8' + some_ops], +- ['composite/Some/x8r8g8b8', '-t composite -f a8r8g8b8,x8r8g8b8' + some_ops], +- ['composite/Some/a2r10g10b10', '-t composite -f a8r8g8b8,a2r10g10b10' + some_ops], +- ['ca composite/Some/a8r8g8b8', '-t cacomposite -f a8r8g8b8' + some_ops], +- ['ca composite/Some/a8', '-t cacomposite -f a8r8g8b8,a8' + some_ops], +- ['ca composite/Some/x8r8g8b8', '-t cacomposite -f a8r8g8b8,x8r8g8b8' + some_ops], +- ['ca composite/Some/a2r10g10b10', '-t cacomposite -f a8r8g8b8,a2r10g10b10' + some_ops], +# ['blend/Src', '-t blend -o src'], +# ['blend/Over', '-t blend -o over'], - ['composite/Some/a8r8g8b8', '-t composite -f a8r8g8b8' + some_ops], -- ['composite/Some/x8r8g8b8', '-t composite -f a8r8g8b8,x8r8g8b8' + some_ops], ++# ['composite/Some/a8r8g8b8', '-t composite -f a8r8g8b8' + some_ops], +# ['composite/Some/x8r8g8b8', '-t composite -f a8r8g8b8,x8r8g8b8' + some_ops], - ['composite/Some/a2r10g10b10', '-t composite -f a8r8g8b8,a2r10g10b10' + some_ops], - ['ca composite/Some/a8r8g8b8', '-t cacomposite -f a8r8g8b8' + some_ops], - ['ca composite/Some/a8', '-t cacomposite -f a8r8g8b8,a8' + some_ops], -- ['ca composite/Some/x8r8g8b8', '-t cacomposite -f a8r8g8b8,x8r8g8b8' + some_ops], ++# ['composite/Some/a2r10g10b10', '-t composite -f a8r8g8b8,a2r10g10b10' + some_ops], ++# ['ca composite/Some/a8r8g8b8', '-t cacomposite -f a8r8g8b8' + some_ops], ++# ['ca composite/Some/a8', '-t cacomposite -f a8r8g8b8,a8' + some_ops], +# ['ca composite/Some/x8r8g8b8', '-t cacomposite -f a8r8g8b8,x8r8g8b8' + some_ops], - ['ca composite/Some/a2r10g10b10', '-t cacomposite -f a8r8g8b8,a2r10g10b10' + some_ops], ++# ['ca composite/Some/a2r10g10b10', '-t cacomposite -f a8r8g8b8,a2r10g10b10' + some_ops], ['fill', '-t fill'], ['bug7366', '-t bug7366'], + ['destination coordinates', '-t dcoords'], +@@ -30,7 +30,7 @@ rendercheck_tests = [ + ['mask coordinates', '-t mcoords'], + ['translated source coordinates', '-t tscoords'], + ['translated mask coordinates', '-t tmcoords'], +- ['triangles', '-t triangles'], ++# ['triangles', '-t triangles'], + ['LibreOffice xRGB', '-t libreoffice_xrgb'], + ['GTK ARGB vs xBGR', '-t gtk_argb_xbgr'], + ] -- -2.17.0 +2.21.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 deleted file mode 100644 index 73a01f7..0000000 --- a/patches/xserver-meson/0001-meson-Fix-build-of-unit-tests.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8dfe428e52c5d97f8de31f25630f30eafad3a9fe Mon Sep 17 00:00:00 2001 -From: Jon Turney -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/0006-Revert-meson-Fix-libshadow.so-linkage.patch b/patches/xserver-meson/0006-Revert-meson-Fix-libshadow.so-linkage.patch new file mode 100644 index 0000000..182ec9d --- /dev/null +++ b/patches/xserver-meson/0006-Revert-meson-Fix-libshadow.so-linkage.patch @@ -0,0 +1,26 @@ +From 76bca2566e1dd4434ecec4d0377bba2f6e15d8ae Mon Sep 17 00:00:00 2001 +From: Jon Turney +Date: Thu, 11 Jul 2019 11:35:39 +0100 +Subject: [PATCH xserver] Revert "meson: Fix libshadow.so linkage" + +This reverts commit a530b6e8923f2b9153a773c8618a1e2f41619288. +--- + hw/xfree86/dixmods/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build +index 0562b630f..835d23215 100644 +--- a/hw/xfree86/dixmods/meson.build ++++ b/hw/xfree86/dixmods/meson.build +@@ -34,7 +34,7 @@ shared_module( + c_args: xorg_c_args, + dependencies: common_dep, + link_whole: libxserver_miext_shadow, +- link_with: e, ++ link_with: [fb, e], + + install: true, + install_dir: module_dir, +-- +2.21.0 + -- cgit v1.2.3