From 561bfe881d9c2c2a7640422ed7de9767bf6102e8 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Wed, 18 Feb 2026 15:29:02 +0000
Subject: [PATCH] piglit: upgrade to latest revision

---
 ...o-not-obtain-wayland-scanner-path-fr.patch |   4 +-
 ...use-shape-in-place-of-newshape-on-nu.patch | 105 ------------------
 ...Fix-narrowing-errors-seen-with-clang.patch |   2 +-
 ...ake-egl_ext_surface_compression-cond.patch |   2 +-
 ...r.py-modify-_command-and-not-command.patch |   5 +-
 ...proper-WAYLAND_INCLUDE_DIRS-variable.patch |   2 +-
 ...t-shader.c-do-not-hardcode-build-pat.patch |   2 +-
 meta/recipes-graphics/piglit/piglit_git.bb    |   3 +-
 8 files changed, 8 insertions(+), 117 deletions(-)
 delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-generated_tests-use-shape-in-place-of-newshape-on-nu.patch

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 6ce2348a71..b5c4243f64 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 9ffd24add3263e24975318e693309881eadd99a2 Mon Sep 17 00:00:00 2001
+From a8643da4298b7dc6942bc0c6e918ec12ac4f0355 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 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 <alex@linutronix.de>
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 99ae07a4a..d5ee9cc22 100644
+index 93efbd1ad..86584ecbc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -211,11 +211,7 @@ if(PIGLIT_USE_WAYLAND)
diff --git a/meta/recipes-graphics/piglit/piglit/0001-generated_tests-use-shape-in-place-of-newshape-on-nu.patch b/meta/recipes-graphics/piglit/piglit/0001-generated_tests-use-shape-in-place-of-newshape-on-nu.patch
deleted file mode 100644
index acf2671262..0000000000
--- a/meta/recipes-graphics/piglit/piglit/0001-generated_tests-use-shape-in-place-of-newshape-on-nu.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From ad6ee4d7c4d3b882ef6196832ed2bbc78b7cb10a Mon Sep 17 00:00:00 2001
-From: Wang Mingyu <wangmy@fujitsu.com>
-Date: Wed, 11 Feb 2026 03:42:24 +0000
-Subject: [PATCH] generated_tests: use 'shape' in place of 'newshape' on
- numpy>=2.1
-
-The 'newshape' parameter was deprecated upstream but kept for backwards
-compatibility reasons. It was finally removed as of numpy 2.4.0, so
-transition to using 'shape' in its place when available.
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/piglit/-/commit/c1dd58ff61fe6b713af795e2680c16371c1cb98c]
-
-Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
----
- generated_tests/builtin_function.py      | 17 +++++++++++++++--
- generated_tests/builtin_function_fp64.py | 17 +++++++++++++++--
- 2 files changed, 30 insertions(+), 4 deletions(-)
-
-diff --git a/generated_tests/builtin_function.py b/generated_tests/builtin_function.py
-index eb7e078..f87236f 100644
---- a/generated_tests/builtin_function.py
-+++ b/generated_tests/builtin_function.py
-@@ -58,6 +58,11 @@ import numpy as np
- if np.lib.NumpyVersion(np.__version__) >= '2.0.0b1':
-     np.set_printoptions(legacy = "1.25")
- 
-+if np.lib.NumpyVersion(np.__version__) >= '2.1.0':
-+    np_reshape_shape = 'shape'
-+else:
-+    np_reshape_shape = 'newshape'
-+
- # Floating point types used by Python and numpy
- FLOATING_TYPES = (float, np.float64, np.float32)
- 
-@@ -293,7 +298,11 @@ def column_major_values(value):
-     """Given a native numpy value, return a list of the scalar values
-     comprising it, in column-major order."""
-     if isinstance(value, np.ndarray):
--        return list(np.reshape(value, newshape=-1, order='F'))
-+        reshape_args = {
-+            np_reshape_shape: -1,
-+            'order': 'F',
-+        }
-+        return list(np.reshape(value, **reshape_args))
-     else:
-         return [value]
- 
-@@ -301,7 +310,11 @@ def column_major_values(value):
- def glsl_constant(value):
-     """Given a native numpy value, return GLSL code that constructs
-     it."""
--    column_major = np.reshape(np.array(value), newshape=-1, order='F')
-+    reshape_args = {
-+        np_reshape_shape: -1,
-+        'order': 'F',
-+    }
-+    column_major = np.reshape(np.array(value), **reshape_args)
-     if column_major.dtype == bool:
-         values = ['true' if x else 'false' for x in column_major]
-     elif column_major.dtype == np.int64:
-diff --git a/generated_tests/builtin_function_fp64.py b/generated_tests/builtin_function_fp64.py
-index 84d939c..06fe987 100644
---- a/generated_tests/builtin_function_fp64.py
-+++ b/generated_tests/builtin_function_fp64.py
-@@ -57,6 +57,11 @@ import numpy as np
- if np.lib.NumpyVersion(np.__version__) >= '2.0.0b1':
-     np.set_printoptions(legacy = "1.25")
- 
-+if np.lib.NumpyVersion(np.__version__) >= '2.1.0':
-+    np_reshape_shape = 'shape'
-+else:
-+    np_reshape_shape = 'newshape'
-+
- # Floating point types used by Python and numpy
- DOUBLE_TYPES = (float, np.float64, np.float32)
- 
-@@ -254,7 +259,11 @@ def column_major_values(value):
-     """Given a native numpy value, return a list of the scalar values
-     comprising it, in column-major order."""
-     if isinstance(value, np.ndarray):
--        return list(np.reshape(value, newshape=-1, order='F'))
-+        reshape_args = {
-+            np_reshape_shape: -1,
-+            'order': 'F',
-+        }
-+        return list(np.reshape(value, **reshape_args))
-     else:
-         return [value]
- 
-@@ -262,7 +271,11 @@ def column_major_values(value):
- def glsl_constant(value):
-     """Given a native numpy value, return GLSL code that constructs
-     it."""
--    column_major = np.reshape(np.array(value), newshape=-1, order='F')
-+    reshape_args = {
-+        np_reshape_shape: -1,
-+        'order': 'F',
-+    }
-+    column_major = np.reshape(np.array(value), **reshape_args)
-     if column_major.dtype == bool:
-         values = ['true' if x else 'false' for x in column_major]
-     else:
--- 
-2.43.0
-
diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch
index 9751b20673..5bb4ecf143 100644
--- a/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch
+++ b/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch
@@ -1,4 +1,4 @@
-From 0ba2f908f2a2a897e8e06e34f99893d11ee4734c Mon Sep 17 00:00:00 2001
+From 4e1e1ac0add7a6a75843bdb9da09a1c55a2a2196 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 3 May 2023 21:59:43 -0700
 Subject: [PATCH] tests: Fix narrowing errors seen with clang
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
index c6c072c7e0..d7ffd13436 100644
--- 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
@@ -1,4 +1,4 @@
-From d6ed4c477f22309c09accd4fee68486d7714f205 Mon Sep 17 00:00:00 2001
+From 42c81fc1740dbb23100e3741f115c9bd4d0e12f3 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Fri, 22 Nov 2024 22:52:31 +0100
 Subject: [PATCH] tests/egl/spec: make egl_ext_surface_compression conditional
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 f8600556e5..0a6d649b8a 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 846efe923932d66810305b228fa09f83a172296d Mon Sep 17 00:00:00 2001
+From d9063d81e772cd959bf18caafce3e781113e5c22 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Thu, 22 May 2025 17:34:15 +0200
 Subject: [PATCH] tests/no_error.py: modify _command and not command
@@ -27,6 +27,3 @@ index 4ecaa9a01..c64eec0a1 100644
          profile.test_list['{} khr_no_error'.format(name)] = test
 -        test.command += ['-khr_no_error']
 +        test._command += ['-khr_no_error']
--- 
-2.39.5
-
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 6cb561c3f2..dbbf202087 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 deb0c15890fb9d0f4fc7074dde2a51c89cb5bf6d Mon Sep 17 00:00:00 2001
+From 6a983bb7cca2e98b31dcf3d6da29937217122243 Mon Sep 17 00:00:00 2001
 From: Pascal Bach <pascal.bach@siemens.com>
 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 7706d88086..3a432782d4 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 66d1d86ff8be33df265d0dda717be385fe8637cd Mon Sep 17 00:00:00 2001
+From 3555d2d0411859e7e231b8b39b7a2a722ca85d24 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 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 7659635062..51f5bf1968 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -13,11 +13,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-egl-spec-make-egl_ext_surface_compression-cond.patch \
            file://0001-tests-no_error.py-modify-_command-and-not-command.patch \
-           file://0001-generated_tests-use-shape-in-place-of-newshape-on-nu.patch \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-SRCREV = "a0a27e528f643dfeb785350a1213bfff09681950"
+SRCREV = "8e2c8bc0018f42b107d470a2de1bf7f53e8fb012"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr"
 
-- 
2.47.1

