diff options
| author |   Wang Mingyu <wangmy@fujitsu.com> | 2024-03-13 15:08:29 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-16 07:38:36 +0100 |
| commit | 45c97d420316c3a61412a25c55b2a53a379423fa (patch) | |
| tree | 41b1ce06c413078045b989a5002b0e3d5d41d9f1 /meta/recipes-graphics | |
| parent | 927ca26e9c69cd6047221a95bfffff11f90d6f1e (diff) | |
| download | openembedded-core-45c97d420316c3a61412a25c55b2a53a379423fa.tar.gz | |
shaderc: update 2023.8 -> 2024.0
0001-cmake-disable-building-external-dependencies.patch
refreshed for 2024.0
Changelog:
==========
- Update dependencies
- Utilities:
- Use Python3 explicitly in utility scripts
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch | 12 | ||||
| -rw-r--r-- | meta/recipes-graphics/shaderc/shaderc_2024.0.bb (renamed from meta/recipes-graphics/shaderc/shaderc_2023.8.bb) | 2 |
2 files changed, 7 insertions, 7 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 4212512034..5c49aa7fd5 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 792a46ef27ef879a21c9f01a198eae213ea535e6 Mon Sep 17 00:00:00 2001 +From 941f5f5831e7a52c26168f81f25d0470860ca6f1 Mon Sep 17 00:00:00 2001 From: Jose Quaresma <quaresma.jose@gmail.com> 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 <quaresma.jose@gmail.com> 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7bc8f5d..13fc535 100644 +index ffcb54b..cce715e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,6 +62,7 @@ else() @@ -26,7 +26,7 @@ index 7bc8f5d..13fc535 100644 set (CMAKE_CXX_STANDARD 17) -@@ -123,8 +124,14 @@ endif(MSVC) +@@ -119,8 +120,14 @@ endif(MSVC) # Configure subdirectories. @@ -43,9 +43,9 @@ index 7bc8f5d..13fc535 100644 add_subdirectory(libshaderc_util) add_subdirectory(libshaderc) -@@ -136,7 +143,7 @@ endif() +@@ -132,7 +139,7 @@ endif() add_custom_target(build-version - ${PYTHON_EXECUTABLE} + ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py - ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc + ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} @@ -53,7 +53,7 @@ index 7bc8f5d..13fc535 100644 function(define_pkg_config_file NAME LIBS) diff --git a/utils/update_build_version.py b/utils/update_build_version.py -index 11ee53e..d39e59d 100755 +index b7ce5b8..95b34c5 100755 --- a/utils/update_build_version.py +++ b/utils/update_build_version.py @@ -30,6 +30,7 @@ import re diff --git a/meta/recipes-graphics/shaderc/shaderc_2023.8.bb b/meta/recipes-graphics/shaderc/shaderc_2024.0.bb index bc7afbdf5e..9975c608ac 100644 --- a/meta/recipes-graphics/shaderc/shaderc_2023.8.bb +++ b/meta/recipes-graphics/shaderc/shaderc_2024.0.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/google/shaderc" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "f8a25c591bf5edbb462ca4aea99dcc666f096d13" +SRCREV = "9f56ca620c07d6c4d119c65c1c1f3f1c584c9985" 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 \ |