From 0e88528515e86833aa69e919dc3444b42a7704f8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 6 Mar 2024 07:42:24 -0800 Subject: shaderc: update 2023.7 -> 2023.8 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...txt-drop-OSDependent-OGLCompiler-from-lis.patch | 76 ---------------------- ...ke-disable-building-external-dependencies.patch | 13 ++-- ...erc_util-fix-glslang-header-file-location.patch | 5 +- meta/recipes-graphics/shaderc/shaderc_2023.7.bb | 30 --------- meta/recipes-graphics/shaderc/shaderc_2023.8.bb | 29 +++++++++ 5 files changed, 37 insertions(+), 116 deletions(-) delete mode 100644 meta/recipes-graphics/shaderc/files/0001-CMakeLists.txt-drop-OSDependent-OGLCompiler-from-lis.patch delete mode 100644 meta/recipes-graphics/shaderc/shaderc_2023.7.bb create mode 100644 meta/recipes-graphics/shaderc/shaderc_2023.8.bb (limited to 'meta/recipes-graphics') 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 deleted file mode 100644 index ecaa2ddb30..0000000000 --- a/meta/recipes-graphics/shaderc/files/0001-CMakeLists.txt-drop-OSDependent-OGLCompiler-from-lis.patch +++ /dev/null @@ -1,76 +0,0 @@ -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/files/0001-cmake-disable-building-external-dependencies.patch b/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch index 35855bd832..4212512034 100644 --- a/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch +++ b/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch @@ -1,4 +1,4 @@ -From d3fbd6b9427f29606540528d17fe02930cd78d0c Mon Sep 17 00:00:00 2001 +From 792a46ef27ef879a21c9f01a198eae213ea535e6 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 13 Feb 2021 00:45:56 +0000 Subject: [PATCH] cmake: disable building external dependencies @@ -9,17 +9,16 @@ Subject: [PATCH] cmake: disable building external dependencies Upstream-Status: Inappropriate [OE-core specific] Signed-off-by: Jose Quaresma - --- CMakeLists.txt | 13 ++++++++++--- utils/update_build_version.py | 22 +++++++++++++++------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 633c244..75b01da 100644 +index 7bc8f5d..13fc535 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -67,6 +67,7 @@ else() +@@ -62,6 +62,7 @@ else() endif() option(SHADERC_ENABLE_WERROR_COMPILE "Enable passing -Werror to compiler, if available" ON) @@ -27,7 +26,7 @@ index 633c244..75b01da 100644 set (CMAKE_CXX_STANDARD 17) -@@ -129,8 +130,14 @@ endif(MSVC) +@@ -123,8 +124,14 @@ endif(MSVC) # Configure subdirectories. @@ -44,7 +43,7 @@ index 633c244..75b01da 100644 add_subdirectory(libshaderc_util) add_subdirectory(libshaderc) -@@ -142,7 +149,7 @@ endif() +@@ -136,7 +143,7 @@ endif() add_custom_target(build-version ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py @@ -54,7 +53,7 @@ index 633c244..75b01da 100644 function(define_pkg_config_file NAME LIBS) diff --git a/utils/update_build_version.py b/utils/update_build_version.py -index 5785390..f72b762 100755 +index 11ee53e..d39e59d 100755 --- a/utils/update_build_version.py +++ b/utils/update_build_version.py @@ -30,6 +30,7 @@ import re diff --git a/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch b/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch index 0e8ad7e4d2..39f982b7f3 100644 --- a/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch +++ b/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch @@ -1,4 +1,4 @@ -From d02ad48d5c9b48af70ddea2e6998081347ef82f3 Mon Sep 17 00:00:00 2001 +From ec2442940e1d5338971861bb81537bae3a6c19e2 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 13 Feb 2021 00:45:56 +0000 Subject: [PATCH] libshaderc_util: fix glslang header file location @@ -6,13 +6,12 @@ Subject: [PATCH] libshaderc_util: fix glslang header file location Upstream-Status: Pending Signed-off-by: Jose Quaresma - --- libshaderc_util/src/compiler.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc -index 051558b..9c4476c 100644 +index e5f5d10..5fd6d3c 100644 --- a/libshaderc_util/src/compiler.cc +++ b/libshaderc_util/src/compiler.cc @@ -20,7 +20,7 @@ diff --git a/meta/recipes-graphics/shaderc/shaderc_2023.7.bb b/meta/recipes-graphics/shaderc/shaderc_2023.7.bb deleted file mode 100644 index cf2ced98f0..0000000000 --- a/meta/recipes-graphics/shaderc/shaderc_2023.7.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "A collection of tools, libraries and tests for shader compilation" -DESCRIPTION = "The Shaderc library provides an API for compiling GLSL/HLSL \ -source code to SPIRV modules. It has been shipping in the Android NDK since version r12b." -SECTION = "graphics" -HOMEPAGE = "https://github.com/google/shaderc" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRCREV = "3882b16417077aa8eaa7b5775920e7ba4b8a224d" -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" - -inherit cmake python3native pkgconfig - -DEPENDS = "spirv-headers spirv-tools glslang" - -EXTRA_OECMAKE = " \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_EXTERNAL=OFF \ - -DSHADERC_SKIP_TESTS=ON \ - -DSHADERC_SKIP_EXAMPLES=ON \ - -DSHADERC_SKIP_COPYRIGHT_CHECK=ON \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/shaderc/shaderc_2023.8.bb b/meta/recipes-graphics/shaderc/shaderc_2023.8.bb new file mode 100644 index 0000000000..bc7afbdf5e --- /dev/null +++ b/meta/recipes-graphics/shaderc/shaderc_2023.8.bb @@ -0,0 +1,29 @@ +SUMMARY = "A collection of tools, libraries and tests for shader compilation" +DESCRIPTION = "The Shaderc library provides an API for compiling GLSL/HLSL \ +source code to SPIRV modules. It has been shipping in the Android NDK since version r12b." +SECTION = "graphics" +HOMEPAGE = "https://github.com/google/shaderc" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +SRCREV = "f8a25c591bf5edbb462ca4aea99dcc666f096d13" +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 \ + " +UPSTREAM_CHECK_GITTAGREGEX = "^v(?P\d+(\.\d+)+)$" +S = "${WORKDIR}/git" + +inherit cmake python3native pkgconfig + +DEPENDS = "spirv-headers spirv-tools glslang" + +EXTRA_OECMAKE = " \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_EXTERNAL=OFF \ + -DSHADERC_SKIP_TESTS=ON \ + -DSHADERC_SKIP_EXAMPLES=ON \ + -DSHADERC_SKIP_COPYRIGHT_CHECK=ON \ +" + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg