diff --git a/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch b/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch index 46e5a6d83f..5ae8d4a499 100644 --- a/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch +++ b/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch @@ -1,4 +1,4 @@ -From abccc17819ad208c0df3edbc8bbcd134e45864f9 Mon Sep 17 00:00:00 2001 +From 1b3d0741044c782731d22d7fed7e92ef409bb966 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 23 Aug 2024 15:29:45 +0200 Subject: [PATCH] CMakeLists.txt: do not obtain wayland-scanner path from @@ -17,7 +17,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 95f40ebfe..4c7da07b4 100644 +index 1a38c21f9..45c181e85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -211,11 +211,7 @@ if(PIGLIT_USE_WAYLAND) diff --git a/meta/recipes-graphics/piglit/piglit/0001-pixel-local-tests-use-unsigned-int-instead-of-uint.patch b/meta/recipes-graphics/piglit/piglit/0001-pixel-local-tests-use-unsigned-int-instead-of-uint.patch deleted file mode 100644 index 2c01fe7029..0000000000 --- a/meta/recipes-graphics/piglit/piglit/0001-pixel-local-tests-use-unsigned-int-instead-of-uint.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8b98674fedc0ac31e768ccd16165bcb585e413e2 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 2 Jul 2026 13:56:17 +0200 -Subject: [PATCH] pixel-local-tests: use unsigned int instead of uint - -uint is not a valid integer type in C, and this fails -to compile under musl libc library. - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/1170] -Signed-off-by: Alexander Kanavin ---- - tests/spec/ext_shader_pixel_local_storage/pixel-local-tests.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/spec/ext_shader_pixel_local_storage/pixel-local-tests.c b/tests/spec/ext_shader_pixel_local_storage/pixel-local-tests.c -index 4776193f2..1ac669d11 100644 ---- a/tests/spec/ext_shader_pixel_local_storage/pixel-local-tests.c -+++ b/tests/spec/ext_shader_pixel_local_storage/pixel-local-tests.c -@@ -851,7 +851,7 @@ make_test_main_str(char *dst, struct pls_format_data *format_data, - case GL_RGBA8UI: - case GL_RG16UI: - case GL_R32UI: { -- uint expected[4]; -+ unsigned int expected[4]; - for (int comp = 0; comp < 4; comp++) { - if (comp < format_data[member].num_components) - expected[comp] = format_data[member].u[comp]; diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch deleted file mode 100644 index c71bf4c8bc..0000000000 --- a/meta/recipes-graphics/piglit/piglit/0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 3e7ec165c718234e1afcdf730bdf20942976e25c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 22 Nov 2024 22:52:31 +0100 -Subject: [PATCH] tests/egl/spec: make egl_ext_surface_compression conditional - to X11 - -Otherwise, this error occurs: -| In file included from /srv/storage/alex/yocto/build-64/workspace/sources/piglit/tests/egl/spec/egl_ext_surface_compression/create_surface.c:28: -| /srv/storage/alex/yocto/build-64/workspace/sources/piglit/tests/egl/spec/egl_ext_surface_compression/../../egl-util.h:12:10: fatal error: X11/Xlib.h: No such file or directory -| 12 | #include -| | ^~~~~~~~~~~~ - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/974] -Co-developed-by: Dmitry Baryshkov -Signed-off-by: Dmitry Baryshkov -Signed-off-by: Alexander Kanavin ---- - .../spec/egl_ext_surface_compression/CMakeLists.gles3.txt | 6 ++++-- - tests/egl/spec/egl_ext_surface_compression/create_surface.c | 1 - - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/tests/egl/spec/egl_ext_surface_compression/CMakeLists.gles3.txt b/tests/egl/spec/egl_ext_surface_compression/CMakeLists.gles3.txt -index d9540bcfd..01a70164f 100644 ---- a/tests/egl/spec/egl_ext_surface_compression/CMakeLists.gles3.txt -+++ b/tests/egl/spec/egl_ext_surface_compression/CMakeLists.gles3.txt -@@ -2,10 +2,12 @@ link_libraries( - piglitutil_${piglit_target_api} - ) - --piglit_add_executable(egl_ext_surface_compression-create ../../egl-util.c -+if (PIGLIT_HAS_WAYLAND) -+piglit_add_executable(egl_ext_surface_compression-create - ../../egl-wayland.c create_surface.c) -+endif (PIGLIT_HAS_WAYLAND) - --piglit_add_executable(egl_ext_surface_compression-image ../../egl-util.c -+piglit_add_executable(egl_ext_surface_compression-image - image_storage.c) - - # vim: ft=cmake: -diff --git a/tests/egl/spec/egl_ext_surface_compression/create_surface.c b/tests/egl/spec/egl_ext_surface_compression/create_surface.c -index 71b043b54..09e87dee4 100644 ---- a/tests/egl/spec/egl_ext_surface_compression/create_surface.c -+++ b/tests/egl/spec/egl_ext_surface_compression/create_surface.c -@@ -25,7 +25,6 @@ - #include "piglit-util.h" - #include "piglit-util-egl.h" - #include "piglit-util-gl.h" --#include "../../egl-util.h" - #include "../../egl-wayland.h" - - static enum piglit_result diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-no_error.py-modify-_command-and-not-command.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-no_error.py-modify-_command-and-not-command.patch index 035e7a4d5a..ee39d6df5a 100644 --- a/meta/recipes-graphics/piglit/piglit/0001-tests-no_error.py-modify-_command-and-not-command.patch +++ b/meta/recipes-graphics/piglit/piglit/0001-tests-no_error.py-modify-_command-and-not-command.patch @@ -1,4 +1,4 @@ -From 14e56a6336f36d1112964ce1ff0900ea4b37b483 Mon Sep 17 00:00:00 2001 +From f4de80be6ed99bbade73281c0cac99bac7f5e2eb Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 22 May 2025 17:34:15 +0200 Subject: [PATCH] tests/no_error.py: modify _command and not command diff --git a/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch b/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch index 329fd75975..701c7076ae 100644 --- a/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch +++ b/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch @@ -1,4 +1,4 @@ -From 4444dd748b9324508e3168f64cf0b5adc31b5ebd Mon Sep 17 00:00:00 2001 +From e02e95a4c3103a8223dc89b6dbad3747e641f203 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 4 Oct 2018 14:43:17 +0200 Subject: [PATCH] cmake: use proper WAYLAND_INCLUDE_DIRS variable diff --git a/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch b/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch index 9c05e639b3..2f53abf419 100644 --- a/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch +++ b/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch @@ -1,4 +1,4 @@ -From f9bfdb8d32c2113c39c3be1bd6fd0934f693ab03 Mon Sep 17 00:00:00 2001 +From d10663b34ce8606b82bc153638a2f89bda32d4c0 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 10 Nov 2020 17:13:50 +0000 Subject: [PATCH] tests/util/piglit-shader.c: do not hardcode build path into diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index a3203464d1..cd1ae5d6d2 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -10,13 +10,11 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma file://0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ file://0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \ file://0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch \ - file://0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch \ file://0001-tests-no_error.py-modify-_command-and-not-command.patch \ - file://0001-pixel-local-tests-use-unsigned-int-instead-of-uint.patch \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "56f237be32ed66820eb05ea3cb04cb8b957ccd8d" +SRCREV = "4950babfd2cd4408e4bfd103d935c6e5cff53d20" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr"