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 08:07:02 +0100 |
commit | 94e9740e43494964c4e273c0c10ee9cf1efd37ea (patch) | |
tree | 9691e1e6f45f233a9b068d9873d955c4f940c4f8 /meta | |
parent | 265c88e035203fb3d28f3dd3a6c289e775ab7297 (diff) | |
download | poky-94e9740e43494964c4e273c0c10ee9cf1efd37ea.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
(From OE-Core rev: 45c97d420316c3a61412a25c55b2a53a379423fa)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 @@ | |||
1 | From 792a46ef27ef879a21c9f01a198eae213ea535e6 Mon Sep 17 00:00:00 2001 | 1 | From 941f5f5831e7a52c26168f81f25d0470860ca6f1 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] cmake: disable building external dependencies | 4 | Subject: [PATCH] cmake: disable building external dependencies |
@@ -15,7 +15,7 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | |||
15 | 2 files changed, 25 insertions(+), 10 deletions(-) | 15 | 2 files changed, 25 insertions(+), 10 deletions(-) |
16 | 16 | ||
17 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 17 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
18 | index 7bc8f5d..13fc535 100644 | 18 | index ffcb54b..cce715e 100644 |
19 | --- a/CMakeLists.txt | 19 | --- a/CMakeLists.txt |
20 | +++ b/CMakeLists.txt | 20 | +++ b/CMakeLists.txt |
21 | @@ -62,6 +62,7 @@ else() | 21 | @@ -62,6 +62,7 @@ else() |
@@ -26,7 +26,7 @@ index 7bc8f5d..13fc535 100644 | |||
26 | 26 | ||
27 | set (CMAKE_CXX_STANDARD 17) | 27 | set (CMAKE_CXX_STANDARD 17) |
28 | 28 | ||
29 | @@ -123,8 +124,14 @@ endif(MSVC) | 29 | @@ -119,8 +120,14 @@ endif(MSVC) |
30 | 30 | ||
31 | 31 | ||
32 | # Configure subdirectories. | 32 | # Configure subdirectories. |
@@ -43,9 +43,9 @@ index 7bc8f5d..13fc535 100644 | |||
43 | 43 | ||
44 | add_subdirectory(libshaderc_util) | 44 | add_subdirectory(libshaderc_util) |
45 | add_subdirectory(libshaderc) | 45 | add_subdirectory(libshaderc) |
46 | @@ -136,7 +143,7 @@ endif() | 46 | @@ -132,7 +139,7 @@ endif() |
47 | add_custom_target(build-version | 47 | add_custom_target(build-version |
48 | ${PYTHON_EXECUTABLE} | 48 | ${Python_EXECUTABLE} |
49 | ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py | 49 | ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py |
50 | - ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc | 50 | - ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc |
51 | + ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} | 51 | + ${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 | |||
53 | 53 | ||
54 | function(define_pkg_config_file NAME LIBS) | 54 | function(define_pkg_config_file NAME LIBS) |
55 | diff --git a/utils/update_build_version.py b/utils/update_build_version.py | 55 | diff --git a/utils/update_build_version.py b/utils/update_build_version.py |
56 | index 11ee53e..d39e59d 100755 | 56 | index b7ce5b8..95b34c5 100755 |
57 | --- a/utils/update_build_version.py | 57 | --- a/utils/update_build_version.py |
58 | +++ b/utils/update_build_version.py | 58 | +++ b/utils/update_build_version.py |
59 | @@ -30,6 +30,7 @@ import re | 59 | @@ -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" | |||
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 = "f8a25c591bf5edbb462ca4aea99dcc666f096d13" | 9 | SRCREV = "9f56ca620c07d6c4d119c65c1c1f3f1c584c9985" |
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 \ |