vulkan-cts: upgrade 1.4.2.1 -> 1.4.3.1

New version includes support to build against CMake 4+.

Release notes are available at [0].

The SRC_URI update helper script required adaptations, as it was broken by
recent Poky changes. The SRC_URI entries were only updated manually back then
via [1].

[0]: https://github.com/KhronosGroup/VK-GL-CTS/releases
[1]: https://git.openembedded.org/meta-openembedded/commit/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc?h=master-next&id=fc78d37ff0ce9e0d60455465851dbe4e86d7a8b3

Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 6 insertions, 31 deletions

diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch
deleted file mode 100644
index 9eef9a702e..0000000000
--- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ec12bb7bda60cdf2c848e13df67452a7d30a42be Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 3 Sep 2022 18:52:42 -0700
-Subject: [PATCH] cmake: Define WAYLAND_SCANNER and WAYLAND_PROTOCOLS_DIR if
- not already defined
-
-This helps with cross compiling and providing these knobs from cmake
-cmdline
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- framework/platform/CMakeLists.txt | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
---- a/framework/platform/CMakeLists.txt
-+++ b/framework/platform/CMakeLists.txt
-@@ -83,8 +83,9 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS)
-                                configure_file(${WAYLAND_XDG_SHELL_SRC_DIR}/xdg-shell.c ${DEQP_XDG_SHELL_GEN_OUTPUTS_DIR}/xdg-shell.c COPYONLY)
-                                configure_file(${WAYLAND_XDG_SHELL_SRC_DIR}/xdg-shell.h ${DEQP_XDG_SHELL_GEN_OUTPUTS_DIR}/xdg-shell.h COPYONLY)
-                        else ()
--                               pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
--
-+                               if (NOT WAYLAND_PROTOCOL_DIR)
-+                                       pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
-+                               endif()
-                                if (NOT WAYLAND_SCANNER)
-                                        pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)
-                                endif()
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/generate-srcuri.py b/meta-oe/recipes-graphics/vk-gl-cts/files/generate-srcuri.py
index c2756b592c..3f64e9dc4a 100755
--- a/meta-oe/recipes-graphics/vk-gl-cts/files/generate-srcuri.py
+++ b/meta-oe/recipes-graphics/vk-gl-cts/files/generate-srcuri.py
@@ -53,11 +53,15 @@ def convert_fetch(basedir):
             # Ignore these as so far we can use the system copies
             pass
         elif isinstance(p, fetch.SourceFile):
-            dest = "/".join(["git/external", p.baseDir, p.extractDir])
+            dest = "/".join(
+                ["${BB_GIT_DEFAULT_DESTSUFFIX}/external", p.baseDir, p.extractDir]
+            )
             url = f"{p.url};subdir={dest};sha256sum={p.checksum}"
             lines.append(f"    {url} \\")
         elif isinstance(p, fetch.GitRepo):
-            dest = "/".join(["git/external", p.baseDir, p.extractDir])
+            dest = "/".join(
+                ["${BB_GIT_DEFAULT_DESTSUFFIX}/external", p.baseDir, p.extractDir]
+            )
             url = transform_git(p.httpsUrl, p.revision, dest)
             lines.append(f"    {url} \\")
         else: