diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2025-06-30 17:13:13 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-07-07 22:12:50 +0100 |
commit | 08c8e9066dc9a4e015713e6f6cc072f123d26645 (patch) | |
tree | b51ed874aead36c12f52e15a2641f63fa787345f | |
parent | fbe9a3df9fbfafdce4c46813311a4557d05c466b (diff) | |
download | poky-08c8e9066dc9a4e015713e6f6cc072f123d26645.tar.gz |
shaderc: upgrade 2025.2 -> 2025.3
0001-cmake-disable-building-external-dependencies.patch
refreshed for 2025.3
(From OE-Core rev: 3e95f13bd5547bf3d555d8344e47912bd94d07f8)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch | 10 | ||||
-rw-r--r-- | meta/recipes-graphics/shaderc/shaderc_2025.3.bb (renamed from meta/recipes-graphics/shaderc/shaderc_2025.2.bb) | 2 |
2 files changed, 6 insertions, 6 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 07765653bb..77b81635b6 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 ed0e2fad08a3cd3f0a0c70922737d8a6886f484d Mon Sep 17 00:00:00 2001 | 1 | From 3db09ee0d0bf6390eb3dcd835bd4ef786188bf16 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,10 +15,10 @@ 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 bd6b890..f1ddd74 100644 | 18 | index 06f5395..39b8869 100644 |
19 | --- a/CMakeLists.txt | 19 | --- a/CMakeLists.txt |
20 | +++ b/CMakeLists.txt | 20 | +++ b/CMakeLists.txt |
21 | @@ -62,6 +62,7 @@ else() | 21 | @@ -72,6 +72,7 @@ else() |
22 | endif() | 22 | endif() |
23 | 23 | ||
24 | option(SHADERC_ENABLE_WERROR_COMPILE "Enable passing -Werror to compiler, if available" ON) | 24 | option(SHADERC_ENABLE_WERROR_COMPILE "Enable passing -Werror to compiler, if available" ON) |
@@ -26,7 +26,7 @@ index bd6b890..f1ddd74 100644 | |||
26 | 26 | ||
27 | set (CMAKE_CXX_STANDARD 17) | 27 | set (CMAKE_CXX_STANDARD 17) |
28 | 28 | ||
29 | @@ -119,8 +120,14 @@ endif(MSVC) | 29 | @@ -129,8 +130,14 @@ endif(MSVC) |
30 | 30 | ||
31 | 31 | ||
32 | # Configure subdirectories. | 32 | # Configure subdirectories. |
@@ -43,7 +43,7 @@ index bd6b890..f1ddd74 100644 | |||
43 | 43 | ||
44 | add_subdirectory(libshaderc_util) | 44 | add_subdirectory(libshaderc_util) |
45 | add_subdirectory(libshaderc) | 45 | add_subdirectory(libshaderc) |
46 | @@ -132,7 +139,7 @@ endif() | 46 | @@ -142,7 +149,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 |
diff --git a/meta/recipes-graphics/shaderc/shaderc_2025.2.bb b/meta/recipes-graphics/shaderc/shaderc_2025.3.bb index 9e56b97830..692e85e56c 100644 --- a/meta/recipes-graphics/shaderc/shaderc_2025.2.bb +++ b/meta/recipes-graphics/shaderc/shaderc_2025.3.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 = "8c269ee0fe607f2d7cac00c0cb4fa243d6a6ec26" | 9 | SRCREV = "eb0bc20d0c31320fe834e4ee8eb02807292b9703" |
10 | SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main;tag=v${PV} \ | 10 | SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main;tag=v${PV} \ |
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 \ |