vulkan: upgrade 1.3.224.1 -> 1.3.231.1

Update 0001-generate-glslang-pkg-config.patch to
omit libraries that are no longer present
(their functionality has been folded into glslang library
itself).

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
index b1548c7343436cb05fb1d525e66e1154d8e1efdb..a2dcb13b36381b51e8988c05d8da679b7e5d64e7 100644 (file)
--- a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
+++ b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
@@ -1,4 +1,4 @@
-From 7161916f69ae257ce06d9c9bf25abf9709bc55cc Mon Sep 17 00:00:00 2001
+From e8c1b7e1dc6d108a3b49d0adfdc4f836cfafcf1a Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <quaresma.jose@gmail.com>
 Date: Sun, 7 Feb 2021 01:30:39 +0000
 Subject: [PATCH] generate glslang pkg-config
@@ -16,13 +16,13 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
  create mode 100644 glslang/glslang.pc.cmake.in
 
 diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
-index 45c9813a..cea13975 100644
+index 72e82b48..c6188e12 100644
 --- a/glslang/CMakeLists.txt
 +++ b/glslang/CMakeLists.txt
-@@ -221,6 +221,8 @@ if(ENABLE_GLSLANG_INSTALL)
-         endif()
-     ")
-     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+@@ -223,6 +223,8 @@ if(ENABLE_GLSLANG_INSTALL)
+         ")
+         install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+     endif()
 +    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY)
 +    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
  
@@ -43,5 +43,5 @@ index 00000000..948a0952
 +Description: OpenGL and OpenGL ES shader front end and validator
 +Requires:
 +Version: @GLSLANG_VERSION@
-+Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
++Libs: -L${libdir} -lglslang -lHLSL -lSPVRemapper
 +Cflags: -I${includedir}

diff --git a/meta/recipes-graphics/glslang/glslang_1.3.224.1.bb b/meta/recipes-graphics/glslang/glslang_1.3.231.1.bb
similarity index 95%
rename from meta/recipes-graphics/glslang/glslang_1.3.224.1.bb
rename to meta/recipes-graphics/glslang/glslang_1.3.231.1.bb
index dd8df15fc749376968fccb9c60a1eeaba237a940..fede2516b1238fae10418484a50463c7919a1de8 100644 (file)
--- a/meta/recipes-graphics/glslang/glslang_1.3.224.1.bb
+++ b/meta/recipes-graphics/glslang/glslang_1.3.231.1.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 = "10423ec659d301a0ff2daac8bbf38980abf27590"
+SRCREV = "5755de46b07e4374c05fb1081f65f7ae1f8cca81"
 SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \
            file://0001-generate-glslang-pkg-config.patch"
 PE = "1"

diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.224.1.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.231.1.bb
similarity index 92%
rename from meta/recipes-graphics/spir/spirv-headers_1.3.224.1.bb
rename to meta/recipes-graphics/spir/spirv-headers_1.3.231.1.bb
index 94500a96bad064e232c7c910db8f2bc53b9b57c2..fdcc8d523fa24bec85af6b29e367b4fc61db1290 100644 (file)
--- a/meta/recipes-graphics/spir/spirv-headers_1.3.224.1.bb
+++ b/meta/recipes-graphics/spir/spirv-headers_1.3.231.1.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
 
-SRCREV = "b2a156e1c0434bc8c99aaebba1c7be98be7ac580"
+SRCREV = "85a1ed200d50660786c1a88d9166e871123cce39"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=master"
 PE = "1"
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"

diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.224.1.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb
similarity index 96%
rename from meta/recipes-graphics/spir/spirv-tools_1.3.224.1.bb
rename to meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb
index cfea28a6efee3c88526a5e4a61c741125732502a..ea4779654333485b48c210f3ebc35838af1d180e 100644 (file)
--- a/meta/recipes-graphics/spir/spirv-tools_1.3.224.1.bb
+++ b/meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb
@@ -7,7 +7,7 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "5e61ea2098220059e89523f1f47b0bcd8c33b89a"
+SRCREV = "eb0a36633d2acf4de82588504f951ad0f2cecacb"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https"
 PE = "1"
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"

diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.224.1.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.231.1.bb
similarity index 93%
rename from meta/recipes-graphics/vulkan/vulkan-headers_1.3.224.1.bb
rename to meta/recipes-graphics/vulkan/vulkan-headers_1.3.231.1.bb
index 8d34738ad7af5e54c9f1adca8b78c7186a1fc39a..b41b82af9dddf2eb1574ecb3c2fca16563be05c1 100644 (file)
--- a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.224.1.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.231.1.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 = "c896e2f920273bfee852da9cca2a356bc1c2031e"
+SRCREV = "98f440ce6868c94f5ec6e198cc1adda4760e8849"
 
 S = "${WORKDIR}/git"
 

diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.224.1.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.231.1.bb
similarity index 94%
rename from meta/recipes-graphics/vulkan/vulkan-loader_1.3.224.1.bb
rename to meta/recipes-graphics/vulkan/vulkan-loader_1.3.231.1.bb
index f24db8796237ee50324625ba3808386b6497b7bb..59c52c1db7c8c5ebf76dbeb64e3dcee761c869f8 100644 (file)
--- a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.224.1.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.231.1.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.224;protocol=https"
-SRCREV = "09afdf64210b11ec653a1001e013b5af4fce8559"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.231;protocol=https"
+SRCREV = "eedbf08292a6be19c3527e77ae2df3f209cab285"
 
 S = "${WORKDIR}/git"
 

diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.224.1.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.231.1.bb
similarity index 93%
rename from meta/recipes-graphics/vulkan/vulkan-tools_1.3.224.1.bb
rename to meta/recipes-graphics/vulkan/vulkan-tools_1.3.231.1.bb
index bed10afef1f3a0dda3c162721cea6821cafeb243..9066821de0ad507ddf8f9dbfb9849e17f179a968 100644 (file)
--- a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.224.1.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.231.1.bb
@@ -6,8 +6,8 @@ SECTION = "libs"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=master;protocol=https"
-SRCREV = "497f232680b046db34ba9e9da065e6303a125851"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.3.231;protocol=https"
+SRCREV = "8d2d3e22d684540fdc5a76c15e456fc2fd11e4b7"
 
 S = "${WORKDIR}/git"