vulkan-samples: upgrade to latest revision

Drop patch as the componnent has been removed upstream.

Adjust the selftest using the recipe, as it was adding a recipe patch
in assumption that other patches already existed.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 8d7e984753b3c1446f203bbc40623da96ddcb386..2ad7a3a3482d864fd7a8286398b33e281d8d9c76 100644 (file)
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -1724,7 +1724,7 @@ class DevtoolUpdateTests(DevtoolBase):
         self.assertNotIn(recipe, result.output, 'Recipe should have been reset by finish but wasn\'t')
         self.assertNotExists(os.path.join(self.workspacedir, 'recipes', recipe), 'Recipe directory should not exist after finish')
         expected_status = [(' M', '.*/%s$' % os.path.basename(oldrecipefile)),
-                           ('??', '.*/.*-Adding-a-new-file.patch$')]
+                           ('??', '.*/vulkan/vulkan-samples/$')]
         self._check_repo_status(recipedir, expected_status)
         # Make sure the patch is added to the recipe with the correct "patchdir" option
         result = runCmd('git diff .', cwd=recipedir)

diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch
deleted file mode 100644 (file)
index f50aa80..0000000
--- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e40c14a3e007fac0e4f2e4164fdf14d1712355bd Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyich@gmail.com>
-Date: Fri, 2 Aug 2024 22:44:21 +0100
-Subject: [PATCH] SPIRV/SpvBuilder.h: add missing <cstdint> include
-
-Without the change `glslang` build fails on upcoming `gcc-15` as:
-
-    In file included from /build/source/SPIRV/GlslangToSpv.cpp:45:
-    SPIRV/SpvBuilder.h:248:30: error: 'uint32_t' has not been declared
-      248 |     Id makeDebugLexicalBlock(uint32_t line);
-          |                              ^~~~~~~~
-
-Upstream-Status: Backport [https://github.com/KhronosGroup/glslang/commit/e40c14a3e007fac0e4f2e4164fdf14d1712355bd]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- SPIRV/SpvBuilder.h | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/SPIRV/SpvBuilder.h
-+++ b/SPIRV/SpvBuilder.h
-@@ -56,6 +56,7 @@ namespace spv {
- }
- 
- #include <algorithm>
-+#include <cstdint>
- #include <map>
- #include <memory>
- #include <set>

diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
index b7c9ddd2febf292de0bda87539490d5e7cf20784..64c7e0908cc144e293a25bb30af3047d269dd099 100644 (file)
--- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
@@ -6,11 +6,10 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a"
 
 SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=main;protocol=https;lfs=0 \
-           file://0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch;patchdir=third_party/glslang \
            "
 
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "d27205d14d01ea7d33efc8ba2862478612370182"
+SRCREV = "97fcdeecf2db26a78b432b285af3869a65bb00bd"
 
 UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"