From 680bd85b0ffc900ed1f9761417b37f32a5f503b5 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 5 Dec 2022 10:30:39 +0800 Subject: shaderc: upgrade 2022.3 -> 2022.4 Changelog: ========== - Update to Glslang 11 - Update SPIRV-Tools, SPIRV-Headers dependencies - Add Cmake BUNDLE DESTINATION option for target install - The code coverage build is no longer being tested (From OE-Core rev: d02220516fa7a853aee587742ada829fdb50fb9a) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-graphics/shaderc/shaderc_2022.3.bb | 30 ------------------------- meta/recipes-graphics/shaderc/shaderc_2022.4.bb | 30 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-graphics/shaderc/shaderc_2022.3.bb create mode 100644 meta/recipes-graphics/shaderc/shaderc_2022.4.bb diff --git a/meta/recipes-graphics/shaderc/shaderc_2022.3.bb b/meta/recipes-graphics/shaderc/shaderc_2022.3.bb deleted file mode 100644 index c340646fa7..0000000000 --- a/meta/recipes-graphics/shaderc/shaderc_2022.3.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 = "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" - -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_2022.4.bb b/meta/recipes-graphics/shaderc/shaderc_2022.4.bb new file mode 100644 index 0000000000..0fe6887cbc --- /dev/null +++ b/meta/recipes-graphics/shaderc/shaderc_2022.4.bb @@ -0,0 +1,30 @@ +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 = "067e008c80c323b1cd1ab1e547b38f9a5f52269e" +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" -- cgit v1.2.3-54-g00ecf