From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex@linutronix.de>
Subject: [PATCH 06/15] vulkan-samples: upgrade to latest revision
Date: Mon, 22 Dec 2025 21:44:24 +0100 [thread overview]
Message-ID: <20251222204455.2284529-6-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20251222204455.2284529-1-alex.kanavin@gmail.com>
From: Alexander Kanavin <alex@linutronix.de>
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>
---
meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
...uilder.h-add-missing-cstdint-include.patch | 28 -------------------
.../vulkan/vulkan-samples_git.bb | 3 +-
3 files changed, 2 insertions(+), 31 deletions(-)
delete mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 8d7e984753..2ad7a3a348 100644
--- 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
index f50aa806da..0000000000
--- 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 b7c9ddd2fe..64c7e0908c 100644
--- 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"
--
2.47.3
next prev parent reply other threads:[~2025-12-22 20:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-22 20:44 [PATCH 01/15] sysstat: upgrade 12.7.8 -> 12.7.9 Alexander Kanavin
2025-12-22 20:44 ` [PATCH 02/15] util-linux: upgrade 2.41.2 -> 2.41.3 Alexander Kanavin
2025-12-22 20:44 ` [PATCH 03/15] virglrenderer: upgrade 1.1.1 -> 1.2.0 Alexander Kanavin
2025-12-22 20:44 ` [PATCH 04/15] vte: upgrade 0.82.1 -> 0.82.2 Alexander Kanavin
2025-12-22 20:44 ` [PATCH 05/15] vulkan: upgrade 1.4.328.1 -> 1.4.335.0 Alexander Kanavin
2025-12-22 20:44 ` Alexander Kanavin [this message]
2025-12-22 20:44 ` [PATCH 07/15] wayland-protocols: upgrade 1.45 -> 1.47 Alexander Kanavin
2025-12-22 20:44 ` [PATCH 08/15] wayland-utils: upgrade 1.2.0 -> 1.3.0 Alexander Kanavin
2025-12-22 20:44 ` [PATCH 09/15] wpebackend-fdo: upgrade 1.16.0 -> 1.16.1 Alexander Kanavin
2025-12-22 20:44 ` [PATCH 10/15] x264: upgrade to latest revision Alexander Kanavin
2025-12-22 20:44 ` [PATCH 11/15] xcb-util-cursor: upgrade 0.1.5 -> 0.1.6 Alexander Kanavin
2025-12-22 20:44 ` [PATCH 12/15] xkbcomp: upgrade 1.4.7 -> 1.5.0 Alexander Kanavin
2025-12-22 20:44 ` [PATCH 13/15] xkeyboard-config: upgrade 2.45 -> 2.46 Alexander Kanavin
2025-12-22 20:44 ` [PATCH 14/15] xserver-xorg: upgrade 21.1.18 -> 21.1.21 Alexander Kanavin
2025-12-22 20:44 ` [PATCH 15/15] xwayland: upgrade 24.1.8 -> 24.1.9 Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251222204455.2284529-6-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=alex@linutronix.de \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox