diff mbox series

vulkan-samples: Upgrade to latest tip of trunk

Message ID 20250522190156.731992-2-raj.khem@gmail.com
State New
Headers show
Series vulkan-samples: Upgrade to latest tip of trunk | expand

Commit Message

Khem Raj May 22, 2025, 7:01 p.m. UTC 
Drop backports available in latest sources

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../0001-framework-Include-stdint.h.patch     | 26 ----------------
 ...bal_options.cmake-removed-unused-ROO.patch | 30 -------------------
 .../vulkan/vulkan-samples_git.bb              |  4 +--
 3 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-Include-stdint.h.patch
 delete mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/0003-bldsys-cmake-global_options.cmake-removed-unused-ROO.patch
diff mbox series

Patch

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 b30b0e0017f..00000000000
--- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-Include-stdint.h.patch
+++ /dev/null
@@ -1,26 +0,0 @@ 
-From 9a187d2f54d3683636b951a10c165d949b3a1d18 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 23 Mar 2025 20:09:35 -0700
-Subject: [PATCH] framework: Include stdint.h
-
-Needed for uint32_t used in this header
-GCC 15 gets upset about it.
-
-Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Samples/pull/1314]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- framework/platform/configuration.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/framework/platform/configuration.h b/framework/platform/configuration.h
-index f6a9cae..c15f76f 100644
---- a/framework/platform/configuration.h
-+++ b/framework/platform/configuration.h
-@@ -18,6 +18,7 @@
- #pragma once
- 
- #include <algorithm>
-+#include <cstdint>
- #include <map>
- #include <memory>
- #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 ffac2d78ce6..00000000000
--- a/meta/recipes-graphics/vulkan/vulkan-samples/0003-bldsys-cmake-global_options.cmake-removed-unused-ROO.patch
+++ /dev/null
@@ -1,30 +0,0 @@ 
-From da4ef211810bc3b0c51ea89f02c031a170fe0cb8 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Tue, 1 Apr 2025 18:53:34 +0200
-Subject: [PATCH] bldsys/cmake/global_options.cmake: removed unused
- ROOT_PATH_SIZE define
-
-After various refactorings it is no longer used anywhere (and
-is problematic for build reproducibility, as build path sizes can
-differ between build hosts).
-
-Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Samples/pull/1325]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- bldsys/cmake/global_options.cmake | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/bldsys/cmake/global_options.cmake b/bldsys/cmake/global_options.cmake
-index 96c7add..67a6c5e 100644
---- a/bldsys/cmake/global_options.cmake
-+++ b/bldsys/cmake/global_options.cmake
-@@ -126,9 +126,6 @@ set(CMAKE_CXX_STANDARD 17)
- set(CMAKE_DISABLE_SOURCE_CHANGES ON)
- set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
- 
--string(LENGTH "${CMAKE_SOURCE_DIR}/" ROOT_PATH_SIZE)
--add_definitions(-DROOT_PATH_SIZE=${ROOT_PATH_SIZE})
--
- set(CMAKE_C_FLAGS_DEBUG   "-DDEBUG=0 ${CMAKE_C_FLAGS_DEBUG}")
- set(CMAKE_CXX_FLAGS_DEBUG "-DDEBUG=0 ${CMAKE_CXX_FLAGS_DEBUG}")
- 
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
index 505b6ab2f28..1caff12a5b9 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"
 
 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 \
-           file://0001-framework-Include-stdint.h.patch \
-           file://0003-bldsys-cmake-global_options.cmake-removed-unused-ROO.patch \
            "
 
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "8547ce1022a19870d3e49075b5b08ca2d11c8773"
+SRCREV = "eca122602a5d7a9f63686411dcef1b62feb36a9a"
 
 UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
 S = "${WORKDIR}/git"