summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-Include-stdint.h.patch26
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-samples/0003-bldsys-cmake-global_options.cmake-removed-unused-ROO.patch30
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-samples_git.bb4
3 files changed, 1 insertions, 59 deletions
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-Include-stdint.h.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-Include-stdint.h.patch
deleted file mode 100644
index b30b0e0017..0000000000
--- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-Include-stdint.h.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 9a187d2f54d3683636b951a10c165d949b3a1d18 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 23 Mar 2025 20:09:35 -0700
4Subject: [PATCH] framework: Include stdint.h
5
6Needed for uint32_t used in this header
7GCC 15 gets upset about it.
8
9Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Samples/pull/1314]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 framework/platform/configuration.h | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/framework/platform/configuration.h b/framework/platform/configuration.h
16index f6a9cae..c15f76f 100644
17--- a/framework/platform/configuration.h
18+++ b/framework/platform/configuration.h
19@@ -18,6 +18,7 @@
20 #pragma once
21
22 #include <algorithm>
23+#include <cstdint>
24 #include <map>
25 #include <memory>
26 #include <string>
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0003-bldsys-cmake-global_options.cmake-removed-unused-ROO.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0003-bldsys-cmake-global_options.cmake-removed-unused-ROO.patch
deleted file mode 100644
index ffac2d78ce..0000000000
--- a/meta/recipes-graphics/vulkan/vulkan-samples/0003-bldsys-cmake-global_options.cmake-removed-unused-ROO.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From da4ef211810bc3b0c51ea89f02c031a170fe0cb8 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 1 Apr 2025 18:53:34 +0200
4Subject: [PATCH] bldsys/cmake/global_options.cmake: removed unused
5 ROOT_PATH_SIZE define
6
7After various refactorings it is no longer used anywhere (and
8is problematic for build reproducibility, as build path sizes can
9differ between build hosts).
10
11Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Samples/pull/1325]
12Signed-off-by: Alexander Kanavin <alex@linutronix.de>
13---
14 bldsys/cmake/global_options.cmake | 3 ---
15 1 file changed, 3 deletions(-)
16
17diff --git a/bldsys/cmake/global_options.cmake b/bldsys/cmake/global_options.cmake
18index 96c7add..67a6c5e 100644
19--- a/bldsys/cmake/global_options.cmake
20+++ b/bldsys/cmake/global_options.cmake
21@@ -126,9 +126,6 @@ set(CMAKE_CXX_STANDARD 17)
22 set(CMAKE_DISABLE_SOURCE_CHANGES ON)
23 set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
24
25-string(LENGTH "${CMAKE_SOURCE_DIR}/" ROOT_PATH_SIZE)
26-add_definitions(-DROOT_PATH_SIZE=${ROOT_PATH_SIZE})
27-
28 set(CMAKE_C_FLAGS_DEBUG "-DDEBUG=0 ${CMAKE_C_FLAGS_DEBUG}")
29 set(CMAKE_CXX_FLAGS_DEBUG "-DDEBUG=0 ${CMAKE_CXX_FLAGS_DEBUG}")
30
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
index 554e6eb290..22b5546631 100644
--- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
@@ -7,12 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a"
7 7
8SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=main;protocol=https;lfs=0 \ 8SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=main;protocol=https;lfs=0 \
9 file://0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch;patchdir=third_party/glslang \ 9 file://0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch;patchdir=third_party/glslang \
10 file://0001-framework-Include-stdint.h.patch \
11 file://0003-bldsys-cmake-global_options.cmake-removed-unused-ROO.patch \
12 " 10 "
13 11
14UPSTREAM_CHECK_COMMITS = "1" 12UPSTREAM_CHECK_COMMITS = "1"
15SRCREV = "8547ce1022a19870d3e49075b5b08ca2d11c8773" 13SRCREV = "eca122602a5d7a9f63686411dcef1b62feb36a9a"
16 14
17UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" 15UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
18S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"