From bdcf0bf7b482f145ac61d35c0d74450c54bb8d11 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Thu, 4 Mar 2021 08:29:38 +0800 Subject: shaderc: upgrade 2020.4 -> 2020.5 0003-cmake-add-option-to-skip-build-the-examples.patch removed since it is included in 2020.5 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- ...ake-add-option-to-skip-build-the-examples.patch | 47 ---------------------- meta/recipes-graphics/shaderc/shaderc_2020.4.bb | 29 ------------- meta/recipes-graphics/shaderc/shaderc_2020.5.bb | 28 +++++++++++++ 3 files changed, 28 insertions(+), 76 deletions(-) delete mode 100644 meta/recipes-graphics/shaderc/files/0003-cmake-add-option-to-skip-build-the-examples.patch delete mode 100644 meta/recipes-graphics/shaderc/shaderc_2020.4.bb create mode 100644 meta/recipes-graphics/shaderc/shaderc_2020.5.bb (limited to 'meta') diff --git a/meta/recipes-graphics/shaderc/files/0003-cmake-add-option-to-skip-build-the-examples.patch b/meta/recipes-graphics/shaderc/files/0003-cmake-add-option-to-skip-build-the-examples.patch deleted file mode 100644 index 43f9edc031..0000000000 --- a/meta/recipes-graphics/shaderc/files/0003-cmake-add-option-to-skip-build-the-examples.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f1064e4b6cfc5955bc7e2b036f2d05540da9f09b Mon Sep 17 00:00:00 2001 -From: Jose Quaresma -Date: Sat, 13 Feb 2021 00:45:56 +0000 -Subject: [PATCH 3/3] cmake: add option to skip build the examples - -Upstream-Status: Backport [https://github.com/google/shaderc/commit/8d081127ee28ff5df8123c994c00bc66a57e9e9c] - -Signed-off-by: Jose Quaresma ---- - CMakeLists.txt | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b358f6b..d8a5405 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,6 +40,16 @@ else() - message(STATUS "Configuring Shaderc to avoid building tests.") - endif() - -+option(SHADERC_SKIP_EXAMPLES "Skip building examples" ${SHADERC_SKIP_EXAMPLES}) -+if(NOT ${SHADERC_SKIP_EXAMPLES}) -+ set(SHADERC_ENABLE_EXAMPLES ON) -+endif() -+if(${SHADERC_ENABLE_EXAMPLES}) -+ message(STATUS "Configuring Shaderc to build examples.") -+else() -+ message(STATUS "Configuring Shaderc to avoid building examples.") -+endif() -+ - option(SHADERC_ENABLE_WERROR_COMPILE "Enable passing -Werror to compiler, if available" ON) - option(BUILD_EXTERNAL "Build external dependencies in /third_party" ON) - -@@ -114,7 +124,9 @@ endif() - add_subdirectory(libshaderc_util) - add_subdirectory(libshaderc) - add_subdirectory(glslc) --add_subdirectory(examples) -+if(${SHADERC_ENABLE_EXAMPLES}) -+ add_subdirectory(examples) -+endif() - - add_custom_target(build-version - ${PYTHON_EXECUTABLE} --- -2.30.1 - diff --git a/meta/recipes-graphics/shaderc/shaderc_2020.4.bb b/meta/recipes-graphics/shaderc/shaderc_2020.4.bb deleted file mode 100644 index 73aa0ee969..0000000000 --- a/meta/recipes-graphics/shaderc/shaderc_2020.4.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 = "0dbd899941a43ffd55df527d65128b3b66e75c9c" -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://0003-cmake-add-option-to-skip-build-the-examples.patch \ - " -UPSTREAM_CHECK_GITTAGREGEX = "^v(?P\d+(\.\d+)+)$" -S = "${WORKDIR}/git" - -inherit cmake python3native - -DEPENDS = "spirv-headers spirv-tools glslang" - -EXTRA_OECMAKE = " \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_EXTERNAL=OFF \ - -DSHADERC_SKIP_TESTS=ON \ - -DSHADERC_SKIP_EXAMPLES=ON \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/shaderc/shaderc_2020.5.bb b/meta/recipes-graphics/shaderc/shaderc_2020.5.bb new file mode 100644 index 0000000000..ce51aab034 --- /dev/null +++ b/meta/recipes-graphics/shaderc/shaderc_2020.5.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 = "f3e39a7eed682faececb73f0b85717f2f44ee9ba" +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 + +DEPENDS = "spirv-headers spirv-tools glslang" + +EXTRA_OECMAKE = " \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_EXTERNAL=OFF \ + -DSHADERC_SKIP_TESTS=ON \ + -DSHADERC_SKIP_EXAMPLES=ON \ +" + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg