From ed5a7af5440488e8ac39e23f6d3e016c64d3e24c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 7 Nov 2022 15:55:03 +0100 Subject: [PATCH] shaderc: upgrade 2022.2 -> 2022.3 Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni --- ...rop-OSDependent-OGLCompiler-from-lis.patch | 76 +++++++++++++++++++ .../{shaderc_2022.2.bb => shaderc_2022.3.bb} | 3 +- 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/shaderc/files/0001-CMakeLists.txt-drop-OSDependent-OGLCompiler-from-lis.patch rename meta/recipes-graphics/shaderc/{shaderc_2022.2.bb => shaderc_2022.3.bb} (88%) diff --git a/meta/recipes-graphics/shaderc/files/0001-CMakeLists.txt-drop-OSDependent-OGLCompiler-from-lis.patch b/meta/recipes-graphics/shaderc/files/0001-CMakeLists.txt-drop-OSDependent-OGLCompiler-from-lis.patch new file mode 100644 index 00000000000..ecaa2ddb30f --- /dev/null +++ b/meta/recipes-graphics/shaderc/files/0001-CMakeLists.txt-drop-OSDependent-OGLCompiler-from-lis.patch @@ -0,0 +1,76 @@ +From 7f6c60f928dabd8b15aa948886523ddf15709215 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 2 Nov 2022 15:42:58 +0100 +Subject: [PATCH] CMakeLists.txt: drop OSDependent/OGLCompiler from lists of + glslang libraries + +glslang no longer installs them separately, and all needed +functionality has been merged into glslang shared library itself: + +This wasn't a problem previously as they were still provided, +as static libraries but in latest glslang they no longer are: +https://github.com/KhronosGroup/glslang/commit/7cd519511c32d7e86d901c7ed231cb84c652d18d + +Upstream-Status: Submitted [https://github.com/google/shaderc/pull/1276] +Signed-off-by: Alexander Kanavin +--- + glslc/CMakeLists.txt | 2 +- + libshaderc/CMakeLists.txt | 2 +- + libshaderc/README.md | 4 ++-- + libshaderc_util/CMakeLists.txt | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt +index 31664d1..5093bd9 100644 +--- a/glslc/CMakeLists.txt ++++ b/glslc/CMakeLists.txt +@@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT) + endif(SHADERC_ENABLE_WGSL_OUTPUT) + + target_link_libraries(glslc PRIVATE +- glslang OSDependent OGLCompiler HLSL glslang SPIRV # Glslang libraries ++ glslang HLSL glslang SPIRV # Glslang libraries + $<$:libtint> # Tint libraries, optional + shaderc_util shaderc # internal Shaderc libraries + ${CMAKE_THREAD_LIBS_INIT}) +diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt +index 3ada419..d3542bf 100644 +--- a/libshaderc/CMakeLists.txt ++++ b/libshaderc/CMakeLists.txt +@@ -62,7 +62,7 @@ endif(SHADERC_ENABLE_INSTALL) + + find_package(Threads) + set(SHADERC_LIBS +- glslang OSDependent OGLCompiler glslang ${CMAKE_THREAD_LIBS_INIT} ++ glslang glslang ${CMAKE_THREAD_LIBS_INIT} + shaderc_util + SPIRV # from glslang + SPIRV-Tools +diff --git a/libshaderc/README.md b/libshaderc/README.md +index bf9d317..1071769 100644 +--- a/libshaderc/README.md ++++ b/libshaderc/README.md +@@ -7,8 +7,8 @@ A library for compiling shader strings into SPIR-V. + There are two main shaderc libraries that are created during a CMake + compilation. The first is `libshaderc`, which is a static library + containing just the functionality exposed by libshaderc. It depends +-on other compilation targets `glslang`, `OSDependent`, `OGLCompiler`, +-`shaderc_util`, `SPIRV`, `HLSL`, `SPIRV-Tools`, and `SPIRV-Tools-opt`. ++on other compilation targets `glslang`, `shaderc_util`, `SPIRV`, ++`HLSL`, `SPIRV-Tools`, and `SPIRV-Tools-opt`. + + The other is `libshaderc_combined`, which is a static library containing + libshaderc and all of its dependencies. +diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt +index 99ce3c4..5291175 100644 +--- a/libshaderc_util/CMakeLists.txt ++++ b/libshaderc_util/CMakeLists.txt +@@ -46,7 +46,7 @@ add_definitions(-DENABLE_HLSL) + + find_package(Threads) + target_link_libraries(shaderc_util PRIVATE +- glslang OSDependent OGLCompiler HLSL glslang SPIRV ++ glslang HLSL glslang SPIRV + SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) + + shaderc_add_tests( diff --git a/meta/recipes-graphics/shaderc/shaderc_2022.2.bb b/meta/recipes-graphics/shaderc/shaderc_2022.3.bb similarity index 88% rename from meta/recipes-graphics/shaderc/shaderc_2022.2.bb rename to meta/recipes-graphics/shaderc/shaderc_2022.3.bb index df0fe8e6c8c..c340646fa78 100644 --- a/meta/recipes-graphics/shaderc/shaderc_2022.2.bb +++ b/meta/recipes-graphics/shaderc/shaderc_2022.3.bb @@ -6,10 +6,11 @@ HOMEPAGE = "https://github.com/google/shaderc" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "3f1635df7774a90f691773e0093bc6ad8005de5a" +SRCREV = "4bbb646ddb3279c6a27e7aa0eb86c10c8add987b" SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ file://0001-cmake-disable-building-external-dependencies.patch \ file://0002-libshaderc_util-fix-glslang-header-file-location.patch \ + file://0001-CMakeLists.txt-drop-OSDependent-OGLCompiler-from-lis.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "^v(?P\d+(\.\d+)+)$" S = "${WORKDIR}/git" -- 2.47.3