From 08c8e9066dc9a4e015713e6f6cc072f123d26645 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 30 Jun 2025 17:13:13 +0800 Subject: shaderc: upgrade 2025.2 -> 2025.3 0001-cmake-disable-building-external-dependencies.patch refreshed for 2025.3 (From OE-Core rev: 3e95f13bd5547bf3d555d8344e47912bd94d07f8) Signed-off-by: Wang Mingyu Signed-off-by: Antonin Godard Signed-off-by: Richard Purdie --- ...ke-disable-building-external-dependencies.patch | 10 ++++---- meta/recipes-graphics/shaderc/shaderc_2025.2.bb | 28 ---------------------- meta/recipes-graphics/shaderc/shaderc_2025.3.bb | 28 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 meta/recipes-graphics/shaderc/shaderc_2025.2.bb create mode 100644 meta/recipes-graphics/shaderc/shaderc_2025.3.bb 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 07765653bb..77b81635b6 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 ed0e2fad08a3cd3f0a0c70922737d8a6886f484d Mon Sep 17 00:00:00 2001 +From 3db09ee0d0bf6390eb3dcd835bd4ef786188bf16 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 @@ -15,10 +15,10 @@ Signed-off-by: Jose Quaresma 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index bd6b890..f1ddd74 100644 +index 06f5395..39b8869 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -62,6 +62,7 @@ else() +@@ -72,6 +72,7 @@ else() endif() option(SHADERC_ENABLE_WERROR_COMPILE "Enable passing -Werror to compiler, if available" ON) @@ -26,7 +26,7 @@ index bd6b890..f1ddd74 100644 set (CMAKE_CXX_STANDARD 17) -@@ -119,8 +120,14 @@ endif(MSVC) +@@ -129,8 +130,14 @@ endif(MSVC) # Configure subdirectories. @@ -43,7 +43,7 @@ index bd6b890..f1ddd74 100644 add_subdirectory(libshaderc_util) add_subdirectory(libshaderc) -@@ -132,7 +139,7 @@ endif() +@@ -142,7 +149,7 @@ endif() add_custom_target(build-version ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py diff --git a/meta/recipes-graphics/shaderc/shaderc_2025.2.bb b/meta/recipes-graphics/shaderc/shaderc_2025.2.bb deleted file mode 100644 index 9e56b97830..0000000000 --- a/meta/recipes-graphics/shaderc/shaderc_2025.2.bb +++ /dev/null @@ -1,28 +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 = "8c269ee0fe607f2d7cac00c0cb4fa243d6a6ec26" -SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main;tag=v${PV} \ - 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+)+)$" - -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_2025.3.bb b/meta/recipes-graphics/shaderc/shaderc_2025.3.bb new file mode 100644 index 0000000000..692e85e56c --- /dev/null +++ b/meta/recipes-graphics/shaderc/shaderc_2025.3.bb @@ -0,0 +1,28 @@ +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 = "eb0bc20d0c31320fe834e4ee8eb02807292b9703" +SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main;tag=v${PV} \ + 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+)+)$" + +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 v1.2.3-54-g00ecf