summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-core-hpp_vulkan_resource.h-add-header-incl.patch27
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-samples_git.bb3
2 files changed, 1 insertions, 29 deletions
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-core-hpp_vulkan_resource.h-add-header-incl.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-core-hpp_vulkan_resource.h-add-header-incl.patch
deleted file mode 100644
index c2bb43fe76..0000000000
--- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-core-hpp_vulkan_resource.h-add-header-incl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 8c069a1c4452f626e5bafc547463507d86111319 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 19 Jul 2022 16:55:40 +0200
4Subject: [PATCH] framework/core/hpp_vulkan_resource.h: add header include that
5 defines std::exchange
6
7Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Samples/pull/501]
8Signed-off-by: Alexander Kanavin <alex@linutronix.de>
9---
10 framework/core/hpp_vulkan_resource.h | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/framework/core/hpp_vulkan_resource.h b/framework/core/hpp_vulkan_resource.h
14index 0e30f5a..8d83019 100644
15--- a/framework/core/hpp_vulkan_resource.h
16+++ b/framework/core/hpp_vulkan_resource.h
17@@ -18,6 +18,7 @@
18 #pragma once
19
20 #include <vulkan/vulkan.hpp>
21+#include <utility>
22
23 namespace vkb
24 {
25--
262.30.2
27
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
index 54994c683d..332411b312 100644
--- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
@@ -8,12 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a"
8SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=master;protocol=https \ 8SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=master;protocol=https \
9 file://0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch \ 9 file://0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch \
10 file://debugfix.patch \ 10 file://debugfix.patch \
11 file://0001-framework-core-hpp_vulkan_resource.h-add-header-incl.patch \
12 file://0001-Qualify-move-as-std-move.patch;patchdir=third_party/spirv-cross \ 11 file://0001-Qualify-move-as-std-move.patch;patchdir=third_party/spirv-cross \
13 " 12 "
14 13
15UPSTREAM_CHECK_COMMITS = "1" 14UPSTREAM_CHECK_COMMITS = "1"
16SRCREV = "ee6c1522af8ba9b56f8416c2eedafb440f681085" 15SRCREV = "74d45aace02d99d766126711a8aaa0978276ca00"
17 16
18UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" 17UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
19S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"