diff options
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 @@ | |||
| 1 | From 9a187d2f54d3683636b951a10c165d949b3a1d18 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sun, 23 Mar 2025 20:09:35 -0700 | ||
| 4 | Subject: [PATCH] framework: Include stdint.h | ||
| 5 | |||
| 6 | Needed for uint32_t used in this header | ||
| 7 | GCC 15 gets upset about it. | ||
| 8 | |||
| 9 | Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Samples/pull/1314] | ||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | --- | ||
| 12 | framework/platform/configuration.h | 1 + | ||
| 13 | 1 file changed, 1 insertion(+) | ||
| 14 | |||
| 15 | diff --git a/framework/platform/configuration.h b/framework/platform/configuration.h | ||
| 16 | index 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 @@ | |||
| 1 | From da4ef211810bc3b0c51ea89f02c031a170fe0cb8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex@linutronix.de> | ||
| 3 | Date: Tue, 1 Apr 2025 18:53:34 +0200 | ||
| 4 | Subject: [PATCH] bldsys/cmake/global_options.cmake: removed unused | ||
| 5 | ROOT_PATH_SIZE define | ||
| 6 | |||
| 7 | After various refactorings it is no longer used anywhere (and | ||
| 8 | is problematic for build reproducibility, as build path sizes can | ||
| 9 | differ between build hosts). | ||
| 10 | |||
| 11 | Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Samples/pull/1325] | ||
| 12 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
| 13 | --- | ||
| 14 | bldsys/cmake/global_options.cmake | 3 --- | ||
| 15 | 1 file changed, 3 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/bldsys/cmake/global_options.cmake b/bldsys/cmake/global_options.cmake | ||
| 18 | index 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 | ||
| 8 | SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=main;protocol=https;lfs=0 \ | 8 | SRC_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 | ||
| 14 | UPSTREAM_CHECK_COMMITS = "1" | 12 | UPSTREAM_CHECK_COMMITS = "1" |
| 15 | SRCREV = "8547ce1022a19870d3e49075b5b08ca2d11c8773" | 13 | SRCREV = "eca122602a5d7a9f63686411dcef1b62feb36a9a" |
| 16 | 14 | ||
| 17 | UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" | 15 | UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" |
| 18 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
