Signed-off-by: Alexander Kanavin <[email protected]> --- .../0001-generate-glslang-pkg-config.patch | 18 +++++----- ...lang_1.3.216.0.bb => glslang_1.3.224.1.bb} | 2 +- ....3.216.0.bb => spirv-headers_1.3.224.1.bb} | 0 ...ult-copy-constructor-in-header.-4879.patch | 34 ------------------- ..._1.3.216.0.bb => spirv-tools_1.3.224.1.bb} | 6 ++-- ...3.216.0.bb => vulkan-headers_1.3.224.1.bb} | 2 +- ....3.216.0.bb => vulkan-loader_1.3.224.1.bb} | 4 +-- ...1.3.216.0.bb => vulkan-tools_1.3.224.1.bb} | 2 +- 8 files changed, 16 insertions(+), 52 deletions(-) rename meta/recipes-graphics/glslang/{glslang_1.3.216.0.bb => glslang_1.3.224.1.bb} (95%) rename meta/recipes-graphics/spir/{spirv-headers_1.3.216.0.bb => spirv-headers_1.3.224.1.bb} (100%) delete mode 100644 meta/recipes-graphics/spir/spirv-tools/0001-Remove-default-copy-constructor-in-header.-4879.patch rename meta/recipes-graphics/spir/{spirv-tools_1.3.216.0.bb => spirv-tools_1.3.224.1.bb} (88%) rename meta/recipes-graphics/vulkan/{vulkan-headers_1.3.216.0.bb => vulkan-headers_1.3.224.1.bb} (93%) rename meta/recipes-graphics/vulkan/{vulkan-loader_1.3.216.0.bb => vulkan-loader_1.3.224.1.bb} (94%) rename meta/recipes-graphics/vulkan/{vulkan-tools_1.3.216.0.bb => vulkan-tools_1.3.224.1.bb} (96%)
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 cddd330971..b1548c7343 100644 --- 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 6692611126b40d499c94bbcc8e29604560262072 Mon Sep 17 00:00:00 2001 +From 7161916f69ae257ce06d9c9bf25abf9709bc55cc Mon Sep 17 00:00:00 2001 From: Jose Quaresma <[email protected]> Date: Sun, 7 Feb 2021 01:30:39 +0000 Subject: [PATCH] generate glslang pkg-config @@ -16,21 +16,21 @@ Signed-off-by: Jose Quaresma <[email protected]> create mode 100644 glslang/glslang.pc.cmake.in diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index 1c7d22a2..10c1e841 100644 +index 45c9813a..cea13975 100644 --- a/glslang/CMakeLists.txt +++ b/glslang/CMakeLists.txt -@@ -209,6 +209,8 @@ if(ENABLE_GLSLANG_INSTALL) - EXPORT glslangTargets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() +@@ -221,6 +221,8 @@ if(ENABLE_GLSLANG_INSTALL) + endif() + ") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + 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) - install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - + set(ALL_HEADERS + ${GLSLANG_HEADERS} diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in new file mode 100644 -index 00000000..64b6882d +index 00000000..948a0952 --- /dev/null +++ b/glslang/glslang.pc.cmake.in @@ -0,0 +1,11 @@ diff --git a/meta/recipes-graphics/glslang/glslang_1.3.216.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.224.1.bb similarity index 95% rename from meta/recipes-graphics/glslang/glslang_1.3.216.0.bb rename to meta/recipes-graphics/glslang/glslang_1.3.224.1.bb index 69d9a0a84e..dd8df15fc7 100644 --- a/meta/recipes-graphics/glslang/glslang_1.3.216.0.bb +++ b/meta/recipes-graphics/glslang/glslang_1.3.224.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 = "adbf0d3106b26daa237b10b9bf72b1af7c31092d" +SRCREV = "10423ec659d301a0ff2daac8bbf38980abf27590" 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.216.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.224.1.bb similarity index 100% rename from meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb rename to meta/recipes-graphics/spir/spirv-headers_1.3.224.1.bb diff --git a/meta/recipes-graphics/spir/spirv-tools/0001-Remove-default-copy-constructor-in-header.-4879.patch b/meta/recipes-graphics/spir/spirv-tools/0001-Remove-default-copy-constructor-in-header.-4879.patch deleted file mode 100644 index 044c366a75..0000000000 --- a/meta/recipes-graphics/spir/spirv-tools/0001-Remove-default-copy-constructor-in-header.-4879.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a90ccc240501bf3362b23f67771f65b7dec2ccf9 Mon Sep 17 00:00:00 2001 -From: Jamie Madill <[email protected]> -Date: Fri, 29 Jul 2022 14:26:37 -0400 -Subject: [PATCH] Remove default copy constructor in header. (#4879) - -A recent libc++ roll in Chrome warned of a deprecated copy. We're -still looking if this is a bug in libc++ or a valid warning, but -removing the redundant line is a safe workaround or fix in either -case. - -See discussion in https://crrev.com/c/3791771 - -Upstream-Status: Backport [https://github.com/KhronosGroup/SPIRV-Tools/pull/4879] -Signed-off-by: Khem Raj <[email protected]> ---- - source/opt/merge_return_pass.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/source/opt/merge_return_pass.h b/source/opt/merge_return_pass.h -index a35cf269..d15db2f6 100644 ---- a/source/opt/merge_return_pass.h -+++ b/source/opt/merge_return_pass.h -@@ -118,8 +118,6 @@ class MergeReturnPass : public MemPass { - StructuredControlState(Instruction* break_merge, Instruction* merge) - : break_merge_(break_merge), current_merge_(merge) {} - -- StructuredControlState(const StructuredControlState&) = default; -- - bool InBreakable() const { return break_merge_; } - bool InStructuredFlow() const { return CurrentMergeId() != 0; } - --- -2.37.2 - diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.224.1.bb similarity index 88% rename from meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb rename to meta/recipes-graphics/spir/spirv-tools_1.3.224.1.bb index fc1074d8b8..cfea28a6ef 100644 --- a/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.224.1.bb @@ -7,10 +7,8 @@ SECTION = "graphics" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "c94501352d545e84c821ce031399e76d1af32d18" -SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https \ - file://0001-Remove-default-copy-constructor-in-header.-4879.patch \ - " +SRCREV = "5e61ea2098220059e89523f1f47b0bcd8c33b89a" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https" PE = "1" UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.216.0.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.224.1.bb similarity index 93% rename from meta/recipes-graphics/vulkan/vulkan-headers_1.3.216.0.bb rename to meta/recipes-graphics/vulkan/vulkan-headers_1.3.224.1.bb index 5f7917ae82..8d34738ad7 100644 --- a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.216.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.224.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 = "3ef4c97fd6ea001d75a8e9da408ee473c180e456" +SRCREV = "c896e2f920273bfee852da9cca2a356bc1c2031e" S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.216.0.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.224.1.bb similarity index 94% rename from meta/recipes-graphics/vulkan/vulkan-loader_1.3.216.0.bb rename to meta/recipes-graphics/vulkan/vulkan-loader_1.3.224.1.bb index 15a079879b..f24db87962 100644 --- a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.216.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.224.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.216;protocol=https" -SRCREV = "322f7e3212b4fd9d70d7f48972963c83d24d06e4" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.224;protocol=https" +SRCREV = "09afdf64210b11ec653a1001e013b5af4fce8559" S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.216.0.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.224.1.bb similarity index 96% rename from meta/recipes-graphics/vulkan/vulkan-tools_1.3.216.0.bb rename to meta/recipes-graphics/vulkan/vulkan-tools_1.3.224.1.bb index e26f4504f1..bed10afef1 100644 --- a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.216.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.224.1.bb @@ -7,7 +7,7 @@ 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 = "ef9db7a8ec52f6c56158d83f5d57ef388c1abec1" +SRCREV = "497f232680b046db34ba9e9da065e6303a125851" S = "${WORKDIR}/git" -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#172227): https://lists.openembedded.org/g/openembedded-core/message/172227 Mute This Topic: https://lists.openembedded.org/mt/94612951/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
