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 333e5a28c3..84a5a587e6 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 45bd75328057b19286e21066a69a046cccb6af2a Mon Sep 17 00:00:00 2001 +From aec064810e1659ab3d01fe3ff33cea67a108fa8f 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 9115d3c79..93c6fd44c 100644 +index ee5498105..5229e00e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -211,11 +211,7 @@ if(PIGLIT_USE_WAYLAND) diff --git a/meta/recipes-graphics/piglit/piglit/0001-shader_runner-Keep-strchr-result-const.patch b/meta/recipes-graphics/piglit/piglit/0001-shader_runner-Keep-strchr-result-const.patch deleted file mode 100644 index 3e1a579691..0000000000 --- a/meta/recipes-graphics/piglit/piglit/0001-shader_runner-Keep-strchr-result-const.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Khem Raj -Date: Sat, 24 Oct 2026 10:00:00 -0700 -Subject: [PATCH] shader_runner: Keep strchr() result const - -The include path parsing walks a const char cursor and stores the -result of strchr() in a plain char pointer. Since glibc 2.43, strchr() -preserves the const qualifier of its argument when C23 features are -enabled, which _GNU_SOURCE does, so clang fails the build: - - tests/shaders/shader_runner.c:1665:10: error: initializing 'char *' with an expression of type 'const char *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers] - -line_end is only read, so declare it const. - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/1281] -Signed-off-by: Khem Raj ---- - tests/shaders/shader_runner.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c ---- a/tests/shaders/shader_runner.c -+++ b/tests/shaders/shader_runner.c -@@ -1662,7 +1662,7 @@ leave_state(enum states state, const char *line, const char *script_name) - - cursor = shader_string; - for (unsigned i = 0; i < num_shader_include_paths; i++) { -- char *line_end = strchr(cursor, '\n'); -+ const char *line_end = strchr(cursor, '\n'); - unsigned path_len = line_end - cursor - 1; - char *path = malloc(path_len + 1); - path[path_len] = '\0'; 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 51f9d89d53..1a50719ed1 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 d6584a39cf47759007dfd58235bc488871104946 Mon Sep 17 00:00:00 2001 +From 2b2c2064a3a5519df314785926179022b64904be 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/0001-tests-serializer-reproducible_mtime-should-be-an-int.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-serializer-reproducible_mtime-should-be-an-int.patch index 4578c296b0..e2c8f5f7b2 100644 --- a/meta/recipes-graphics/piglit/piglit/0001-tests-serializer-reproducible_mtime-should-be-an-int.patch +++ b/meta/recipes-graphics/piglit/piglit/0001-tests-serializer-reproducible_mtime-should-be-an-int.patch @@ -1,8 +1,7 @@ -From 58a5bea55a5f7972462124e7a8f1b1971ad5483d Mon Sep 17 00:00:00 2001 +From 8794da96acdbc98801cc911541d7b2d42379fe24 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 22 Oct 2026 14:09:08 +0100 Subject: [PATCH] tests/serializer: reproducible_mtime should be an int -X-ARM-No-Footer: NoDisclaimer The mtime argument is an integer not a string, so parse it with int(). @@ -28,6 +27,3 @@ index 5ee9a1578..f7fdadf43 100644 with gzip.GzipFile(outfile, 'wb', mtime=reproducible_mtime) as f: tree.write(f, encoding='utf-8', xml_declaration=True) --- -2.43.0 - 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 9a25185651..d1074d37c2 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 1a65f18c336ca13fcbf8e7a179375a9447a95285 Mon Sep 17 00:00:00 2001 +From 6631fcfd11e4a852f46c3d0200d8399550848374 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 @@ -15,7 +15,7 @@ Upstream-Status: Submitted [piglit@lists.freedesktop.org] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt -index f9bfec555..07b821375 100644 +index 31b16978c..a5549140b 100644 --- a/tests/util/CMakeLists.txt +++ b/tests/util/CMakeLists.txt @@ -97,7 +97,7 @@ if(PIGLIT_USE_WAFFLE) 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 e469a09a3d..c64d5dd994 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 ebca1b952f830dcd7cb57a3f90a9cb1ccd65a63e Mon Sep 17 00:00:00 2001 +From d49517c9fe7b3ec822e797e54f4cae3f0bdb0a3a 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 7c6a0b4d45..71a10ff8f6 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -12,11 +12,10 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma file://0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch \ file://0001-tests-no_error.py-modify-_command-and-not-command.patch \ file://0001-tests-serializer-reproducible_mtime-should-be-an-int.patch \ - file://0001-shader_runner-Keep-strchr-result-const.patch \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "f73c2b554e565d6ee3fa2a331c60236141a73768" +SRCREV = "edf773823120c32f84c667e9610d21b1d0aa8d42" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr"