diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-06-14 11:29:09 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-06-16 15:40:11 +0100 |
| commit | 8b8cf3e620407610a0cdc80f17812d740aa7eccc (patch) | |
| tree | 0aa20c07b0647cf2596dba246bda8397d61590c7 | |
| parent | 98ed91039a1fe3e2bc9914f283170cf677b1dd2f (diff) | |
| download | poky-8b8cf3e620407610a0cdc80f17812d740aa7eccc.tar.gz | |
shaderc: upgrade 2023.2 -> 2023.4
(From OE-Core rev: e7987b03e949a26be90be2654c7da4e3783667da)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch | 18 | ||||
| -rw-r--r-- | meta/recipes-graphics/shaderc/shaderc_2023.4.bb (renamed from meta/recipes-graphics/shaderc/shaderc_2023.2.bb) | 2 |
2 files changed, 9 insertions, 11 deletions
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 cc9a400028..35855bd832 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,7 +1,7 @@ | |||
| 1 | From 071a9d71bea91bbefcf15e061fc87e53568f3188 Mon Sep 17 00:00:00 2001 | 1 | From d3fbd6b9427f29606540528d17fe02930cd78d0c Mon Sep 17 00:00:00 2001 |
| 2 | From: Jose Quaresma <quaresma.jose@gmail.com> | 2 | From: Jose Quaresma <quaresma.jose@gmail.com> |
| 3 | Date: Sat, 13 Feb 2021 00:45:56 +0000 | 3 | Date: Sat, 13 Feb 2021 00:45:56 +0000 |
| 4 | Subject: [PATCH 1/3] cmake: disable building external dependencies | 4 | Subject: [PATCH] cmake: disable building external dependencies |
| 5 | 5 | ||
| 6 | - add cmake option to disable the build of the third_party dependencies | 6 | - add cmake option to disable the build of the third_party dependencies |
| 7 | - change the update_build_version.py to use pkg-config when third_party dependencies not found | 7 | - change the update_build_version.py to use pkg-config when third_party dependencies not found |
| @@ -9,24 +9,25 @@ Subject: [PATCH 1/3] cmake: disable building external dependencies | |||
| 9 | Upstream-Status: Inappropriate [OE-core specific] | 9 | Upstream-Status: Inappropriate [OE-core specific] |
| 10 | 10 | ||
| 11 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | 11 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> |
| 12 | |||
| 12 | --- | 13 | --- |
| 13 | CMakeLists.txt | 13 ++++++++++--- | 14 | CMakeLists.txt | 13 ++++++++++--- |
| 14 | utils/update_build_version.py | 22 +++++++++++++++------- | 15 | utils/update_build_version.py | 22 +++++++++++++++------- |
| 15 | 2 files changed, 25 insertions(+), 10 deletions(-) | 16 | 2 files changed, 25 insertions(+), 10 deletions(-) |
| 16 | 17 | ||
| 17 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 18 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 18 | index 5c74cd8..b358f6b 100644 | 19 | index 633c244..75b01da 100644 |
| 19 | --- a/CMakeLists.txt | 20 | --- a/CMakeLists.txt |
| 20 | +++ b/CMakeLists.txt | 21 | +++ b/CMakeLists.txt |
| 21 | @@ -41,6 +41,7 @@ else() | 22 | @@ -67,6 +67,7 @@ else() |
| 22 | endif() | 23 | endif() |
| 23 | 24 | ||
| 24 | option(SHADERC_ENABLE_WERROR_COMPILE "Enable passing -Werror to compiler, if available" ON) | 25 | option(SHADERC_ENABLE_WERROR_COMPILE "Enable passing -Werror to compiler, if available" ON) |
| 25 | +option(BUILD_EXTERNAL "Build external dependencies in /third_party" ON) | 26 | +option(BUILD_EXTERNAL "Build external dependencies in /third_party" ON) |
| 26 | 27 | ||
| 27 | set (CMAKE_CXX_STANDARD 11) | 28 | set (CMAKE_CXX_STANDARD 17) |
| 28 | 29 | ||
| 29 | @@ -101,8 +102,14 @@ endif(MSVC) | 30 | @@ -129,8 +130,14 @@ endif(MSVC) |
| 30 | 31 | ||
| 31 | 32 | ||
| 32 | # Configure subdirectories. | 33 | # Configure subdirectories. |
| @@ -43,7 +44,7 @@ index 5c74cd8..b358f6b 100644 | |||
| 43 | 44 | ||
| 44 | add_subdirectory(libshaderc_util) | 45 | add_subdirectory(libshaderc_util) |
| 45 | add_subdirectory(libshaderc) | 46 | add_subdirectory(libshaderc) |
| 46 | @@ -112,7 +119,7 @@ add_subdirectory(examples) | 47 | @@ -142,7 +149,7 @@ endif() |
| 47 | add_custom_target(build-version | 48 | add_custom_target(build-version |
| 48 | ${PYTHON_EXECUTABLE} | 49 | ${PYTHON_EXECUTABLE} |
| 49 | ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py | 50 | ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py |
| @@ -104,6 +105,3 @@ index 5785390..f72b762 100755 | |||
| 104 | mkdir_p(os.path.dirname(output_file)) | 105 | mkdir_p(os.path.dirname(output_file)) |
| 105 | 106 | ||
| 106 | if os.path.isfile(output_file): | 107 | if os.path.isfile(output_file): |
| 107 | -- | ||
| 108 | 2.30.1 | ||
| 109 | |||
diff --git a/meta/recipes-graphics/shaderc/shaderc_2023.2.bb b/meta/recipes-graphics/shaderc/shaderc_2023.4.bb index 07fae0bb7e..739e7ae81c 100644 --- a/meta/recipes-graphics/shaderc/shaderc_2023.2.bb +++ b/meta/recipes-graphics/shaderc/shaderc_2023.4.bb | |||
| @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/google/shaderc" | |||
| 6 | LICENSE = "Apache-2.0" | 6 | LICENSE = "Apache-2.0" |
| 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" |
| 8 | 8 | ||
| 9 | SRCREV = "55f4bbd993de3a3cad34cb41cd07b82fa1c77dd6" | 9 | SRCREV = "7a8b3da0583425cf511336cf3afbdcf2ebc8b36b" |
| 10 | SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ | 10 | SRC_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 \ |
