From 131e4756e9abc4fab062b241fefca68135eac7c4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 1 Apr 2025 11:33:35 +0000 Subject: shaderc: upgrade 2024.3 -> 2025.1 Add tag to SRC_URI to verify SRCREV. (From OE-Core rev: 6126b2693865acdbb08f47a28fe097a2cb659573) Signed-off-by: Richard Purdie --- ...ke-disable-building-external-dependencies.patch | 4 +-- ...erc_util-fix-glslang-header-file-location.patch | 4 +-- meta/recipes-graphics/shaderc/shaderc_2024.3.bb | 29 ---------------------- meta/recipes-graphics/shaderc/shaderc_2025.1.bb | 29 ++++++++++++++++++++++ 4 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 meta/recipes-graphics/shaderc/shaderc_2024.3.bb create mode 100644 meta/recipes-graphics/shaderc/shaderc_2025.1.bb (limited to 'meta') 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 5c49aa7fd5..07765653bb 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 941f5f5831e7a52c26168f81f25d0470860ca6f1 Mon Sep 17 00:00:00 2001 +From ed0e2fad08a3cd3f0a0c70922737d8a6886f484d 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,7 +15,7 @@ Signed-off-by: Jose Quaresma 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index ffcb54b..cce715e 100644 +index bd6b890..f1ddd74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,6 +62,7 @@ else() 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 39f982b7f3..429b53c308 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 ec2442940e1d5338971861bb81537bae3a6c19e2 Mon Sep 17 00:00:00 2001 +From 4797642a6394ad7e5a23aaa3bdf8e2d011f69adf 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 @@ -11,7 +11,7 @@ Signed-off-by: Jose Quaresma 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc -index e5f5d10..5fd6d3c 100644 +index 9bf9a43..dc0efd2 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_2024.3.bb b/meta/recipes-graphics/shaderc/shaderc_2024.3.bb deleted file mode 100644 index 0948ba28d6..0000000000 --- a/meta/recipes-graphics/shaderc/shaderc_2024.3.bb +++ /dev/null @@ -1,29 +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 = "7223dc3d5e34bbcc44f3150546dbfa8a5da58c4c" -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" diff --git a/meta/recipes-graphics/shaderc/shaderc_2025.1.bb b/meta/recipes-graphics/shaderc/shaderc_2025.1.bb new file mode 100644 index 0000000000..e9c0ecdd37 --- /dev/null +++ b/meta/recipes-graphics/shaderc/shaderc_2025.1.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 = "7f68b1cf6f35f518febf36d425365bb8e6ad224a" +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+)+)$" +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 v1.2.3-54-g00ecf