vulkan: upgrade 1.3.243.0 -> 1.3.250.0

Add a patch to vulkan-tools that unbreaks cross-builds.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/glslang/glslang_1.3.243.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.250.0.bb
similarity index 96%
rename from meta/recipes-graphics/glslang/glslang_1.3.243.0.bb
rename to meta/recipes-graphics/glslang/glslang_1.3.250.0.bb
index c50d67a6522aa9ec2d95300abe07bfa9eee8b5d0..6e9c666d46d7c3f89babd28d6fc71d24e58926de 100644 (file)
--- a/meta/recipes-graphics/glslang/glslang_1.3.243.0.bb
+++ b/meta/recipes-graphics/glslang/glslang_1.3.250.0.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler"
 LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3"
 
-SRCREV = "14e5a04e70057972eef8a40df422e30a3b70e4b5"
+SRCREV = "d1517d64cfca91f573af1bf7341dc3a5113349c0"
 SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \
            file://0001-generate-glslang-pkg-config.patch \
            "

diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.243.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.250.0.bb
similarity index 92%
rename from meta/recipes-graphics/spir/spirv-headers_1.3.243.0.bb
rename to meta/recipes-graphics/spir/spirv-headers_1.3.250.0.bb
index e27c0a67dc2d64523bbd5a0b5b4daa9929562581..d0a2e2e9916b3f4107bf4963e94f9aedc8e74dbf 100644 (file)
--- a/meta/recipes-graphics/spir/spirv-headers_1.3.243.0.bb
+++ b/meta/recipes-graphics/spir/spirv-headers_1.3.250.0.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
 
-SRCREV = "1feaf4414eb2b353764d01d88f8aa4bcc67b60db"
+SRCREV = "268a061764ee69f09a477a695bf6a11ffe311b8d"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:

diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.243.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.250.0.bb
similarity index 96%
rename from meta/recipes-graphics/spir/spirv-tools_1.3.243.0.bb
rename to meta/recipes-graphics/spir/spirv-tools_1.3.250.0.bb
index ba89c35c093f2d9d5e756d9c0b7edd56cb049d9b..bde6ddd04b866598614b8ca15dba9a7e5d1da12f 100644 (file)
--- a/meta/recipes-graphics/spir/spirv-tools_1.3.243.0.bb
+++ b/meta/recipes-graphics/spir/spirv-tools_1.3.250.0.bb
@@ -7,7 +7,7 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "44d72a9b36702f093dd20815561a56778b2d181e"
+SRCREV = "e7c6084fd1d6d6f5ac393e842728d8be309688ca"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:

diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.243.0.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.250.0.bb
similarity index 95%
rename from meta/recipes-graphics/vulkan/vulkan-headers_1.3.243.0.bb
rename to meta/recipes-graphics/vulkan/vulkan-headers_1.3.250.0.bb
index 6ddc35e5d870c325e616ef8cf90a38bed99d92f1..2970767ff32313b7647edb21965ef0e5efe47fed 100644 (file)
--- a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.243.0.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.250.0.bb
@@ -11,7 +11,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https"
 
-SRCREV = "65ad768d8603671fc1085fe115019e72a595ced8"
+SRCREV = "9e61870ecbd32514113b467e0a0c46f60ed222c7"
 
 S = "${WORKDIR}/git"
 

diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.243.0.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.250.0.bb
similarity index 95%
rename from meta/recipes-graphics/vulkan/vulkan-loader_1.3.243.0.bb
rename to meta/recipes-graphics/vulkan/vulkan-loader_1.3.250.0.bb
index 20128667f127133b2399fe3053d26721e3d09509..456c97340681e3820a21ae3167564582781294e7 100644 (file)
--- a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.243.0.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.250.0.bb
@@ -9,8 +9,8 @@ SECTION = "libs"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.243;protocol=https"
-SRCREV = "22407d7804f111fbc0e31fa0db592d658e19ae8b"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.250;protocol=https"
+SRCREV = "f372068d09fc13bcf54b8c81274f37aa5f46aea3"
 
 S = "${WORKDIR}/git"
 

diff --git a/meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch b/meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch
new file mode 100644 (file)
index 0000000..6b70a1e
--- /dev/null
+++ b/meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch
@@ -0,0 +1,29 @@
+From 9060e916ca05d34b56c62f2be0b4a77dd104e2aa Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 2 Jun 2023 14:13:00 +0200
+Subject: [PATCH] scripts/CMakeLists.txt: append to CMAKE_FIND_ROOT_PATH
+ instead of replacing it
+
+Resetting CMAKE_FIND_ROOT_PATH in particular breaks builds in Yocto
+(which is a major cross compiling framework).
+
+Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Tools/pull/808]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+
+---
+ scripts/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index 5b979d43..19a58bf9 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -114,7 +114,7 @@ if (MOLTENVK_REPO_ROOT)
+ endif()
+ 
+ if (CMAKE_CROSSCOMPILING)
+-    set(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
++    set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+ else()
+     set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+ endif()

diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.243.0.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.250.0.bb
similarity index 89%
rename from meta/recipes-graphics/vulkan/vulkan-tools_1.3.243.0.bb
rename to meta/recipes-graphics/vulkan/vulkan-tools_1.3.250.0.bb
index dfdd716abd3065f1aa904397e4398902cdee705e..0346b380ee76633e9175d6a99adb24ab9762918c 100644 (file)
--- a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.243.0.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.250.0.bb
@@ -6,8 +6,10 @@ SECTION = "libs"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.3.243;protocol=https"
-SRCREV = "18bdf5565f5d02831869785cbf758fa7b295b7d5"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https \
+           file://0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch \
+           "
+SRCREV = "695887a994ef9cc00a7aa3f9c00b31a56ea79534"
 
 S = "${WORKDIR}/git"