summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2021-03-04 08:29:38 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-06 22:39:04 +0000
commitc2569715504721c0f4fd7e0beb42c26ffe98aab4 (patch)
treeda8e0e96f75534e0c0e4f2216fcbb17873e5993a
parent680da24f4b99f2286211055ad603bb6db6f8b072 (diff)
downloadpoky-c2569715504721c0f4fd7e0beb42c26ffe98aab4.tar.gz
shaderc: upgrade 2020.4 -> 2020.5
0003-cmake-add-option-to-skip-build-the-examples.patch removed since it is included in 2020.5 (From OE-Core rev: bdcf0bf7b482f145ac61d35c0d74450c54bb8d11) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/shaderc/files/0003-cmake-add-option-to-skip-build-the-examples.patch47
-rw-r--r--meta/recipes-graphics/shaderc/shaderc_2020.5.bb (renamed from meta/recipes-graphics/shaderc/shaderc_2020.4.bb)3
2 files changed, 1 insertions, 49 deletions
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 @@
1From f1064e4b6cfc5955bc7e2b036f2d05540da9f09b Mon Sep 17 00:00:00 2001
2From: Jose Quaresma <quaresma.jose@gmail.com>
3Date: Sat, 13 Feb 2021 00:45:56 +0000
4Subject: [PATCH 3/3] cmake: add option to skip build the examples
5
6Upstream-Status: Backport [https://github.com/google/shaderc/commit/8d081127ee28ff5df8123c994c00bc66a57e9e9c]
7
8Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
9---
10 CMakeLists.txt | 14 +++++++++++++-
11 1 file changed, 13 insertions(+), 1 deletion(-)
12
13diff --git a/CMakeLists.txt b/CMakeLists.txt
14index b358f6b..d8a5405 100644
15--- a/CMakeLists.txt
16+++ b/CMakeLists.txt
17@@ -40,6 +40,16 @@ else()
18 message(STATUS "Configuring Shaderc to avoid building tests.")
19 endif()
20
21+option(SHADERC_SKIP_EXAMPLES "Skip building examples" ${SHADERC_SKIP_EXAMPLES})
22+if(NOT ${SHADERC_SKIP_EXAMPLES})
23+ set(SHADERC_ENABLE_EXAMPLES ON)
24+endif()
25+if(${SHADERC_ENABLE_EXAMPLES})
26+ message(STATUS "Configuring Shaderc to build examples.")
27+else()
28+ message(STATUS "Configuring Shaderc to avoid building examples.")
29+endif()
30+
31 option(SHADERC_ENABLE_WERROR_COMPILE "Enable passing -Werror to compiler, if available" ON)
32 option(BUILD_EXTERNAL "Build external dependencies in /third_party" ON)
33
34@@ -114,7 +124,9 @@ endif()
35 add_subdirectory(libshaderc_util)
36 add_subdirectory(libshaderc)
37 add_subdirectory(glslc)
38-add_subdirectory(examples)
39+if(${SHADERC_ENABLE_EXAMPLES})
40+ add_subdirectory(examples)
41+endif()
42
43 add_custom_target(build-version
44 ${PYTHON_EXECUTABLE}
45--
462.30.1
47
diff --git a/meta/recipes-graphics/shaderc/shaderc_2020.4.bb b/meta/recipes-graphics/shaderc/shaderc_2020.5.bb
index 73aa0ee969..ce51aab034 100644
--- a/meta/recipes-graphics/shaderc/shaderc_2020.4.bb
+++ b/meta/recipes-graphics/shaderc/shaderc_2020.5.bb
@@ -6,11 +6,10 @@ HOMEPAGE = "https://github.com/google/shaderc"
6LICENSE = "Apache-2.0" 6LICENSE = "Apache-2.0"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
8 8
9SRCREV = "0dbd899941a43ffd55df527d65128b3b66e75c9c" 9SRCREV = "f3e39a7eed682faececb73f0b85717f2f44ee9ba"
10SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ 10SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \
11 file://0001-cmake-disable-building-external-dependencies.patch \ 11 file://0001-cmake-disable-building-external-dependencies.patch \
12 file://0002-libshaderc_util-fix-glslang-header-file-location.patch \ 12 file://0002-libshaderc_util-fix-glslang-header-file-location.patch \
13 file://0003-cmake-add-option-to-skip-build-the-examples.patch \
14 " 13 "
15UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$" 14UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"
16S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"