diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-06 07:42:24 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-07 17:25:03 +0000 |
commit | 5cb15230617c1ae82fb0617aa2036a6d408e9ef3 (patch) | |
tree | 76458083504cb6514c6ac1f168772db388e9e524 /meta/recipes-graphics | |
parent | 494b7c73c8a38efdfa3d4894e8078bf69e371a38 (diff) | |
download | poky-5cb15230617c1ae82fb0617aa2036a6d408e9ef3.tar.gz |
shaderc: update 2023.7 -> 2023.8
(From OE-Core rev: 0e88528515e86833aa69e919dc3444b42a7704f8)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/shaderc/files/0001-CMakeLists.txt-drop-OSDependent-OGLCompiler-from-lis.patch | 76 | ||||
-rw-r--r-- | meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch | 13 | ||||
-rw-r--r-- | meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch | 5 | ||||
-rw-r--r-- | meta/recipes-graphics/shaderc/shaderc_2023.8.bb (renamed from meta/recipes-graphics/shaderc/shaderc_2023.7.bb) | 3 |
4 files changed, 9 insertions, 88 deletions
diff --git a/meta/recipes-graphics/shaderc/files/0001-CMakeLists.txt-drop-OSDependent-OGLCompiler-from-lis.patch b/meta/recipes-graphics/shaderc/files/0001-CMakeLists.txt-drop-OSDependent-OGLCompiler-from-lis.patch deleted file mode 100644 index ecaa2ddb30..0000000000 --- a/meta/recipes-graphics/shaderc/files/0001-CMakeLists.txt-drop-OSDependent-OGLCompiler-from-lis.patch +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
1 | From 7f6c60f928dabd8b15aa948886523ddf15709215 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Wed, 2 Nov 2022 15:42:58 +0100 | ||
4 | Subject: [PATCH] CMakeLists.txt: drop OSDependent/OGLCompiler from lists of | ||
5 | glslang libraries | ||
6 | |||
7 | glslang no longer installs them separately, and all needed | ||
8 | functionality has been merged into glslang shared library itself: | ||
9 | |||
10 | This wasn't a problem previously as they were still provided, | ||
11 | as static libraries but in latest glslang they no longer are: | ||
12 | https://github.com/KhronosGroup/glslang/commit/7cd519511c32d7e86d901c7ed231cb84c652d18d | ||
13 | |||
14 | Upstream-Status: Submitted [https://github.com/google/shaderc/pull/1276] | ||
15 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
16 | --- | ||
17 | glslc/CMakeLists.txt | 2 +- | ||
18 | libshaderc/CMakeLists.txt | 2 +- | ||
19 | libshaderc/README.md | 4 ++-- | ||
20 | libshaderc_util/CMakeLists.txt | 2 +- | ||
21 | 4 files changed, 5 insertions(+), 5 deletions(-) | ||
22 | |||
23 | diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt | ||
24 | index 31664d1..5093bd9 100644 | ||
25 | --- a/glslc/CMakeLists.txt | ||
26 | +++ b/glslc/CMakeLists.txt | ||
27 | @@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT) | ||
28 | endif(SHADERC_ENABLE_WGSL_OUTPUT) | ||
29 | |||
30 | target_link_libraries(glslc PRIVATE | ||
31 | - glslang OSDependent OGLCompiler HLSL glslang SPIRV # Glslang libraries | ||
32 | + glslang HLSL glslang SPIRV # Glslang libraries | ||
33 | $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint> # Tint libraries, optional | ||
34 | shaderc_util shaderc # internal Shaderc libraries | ||
35 | ${CMAKE_THREAD_LIBS_INIT}) | ||
36 | diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt | ||
37 | index 3ada419..d3542bf 100644 | ||
38 | --- a/libshaderc/CMakeLists.txt | ||
39 | +++ b/libshaderc/CMakeLists.txt | ||
40 | @@ -62,7 +62,7 @@ endif(SHADERC_ENABLE_INSTALL) | ||
41 | |||
42 | find_package(Threads) | ||
43 | set(SHADERC_LIBS | ||
44 | - glslang OSDependent OGLCompiler glslang ${CMAKE_THREAD_LIBS_INIT} | ||
45 | + glslang glslang ${CMAKE_THREAD_LIBS_INIT} | ||
46 | shaderc_util | ||
47 | SPIRV # from glslang | ||
48 | SPIRV-Tools | ||
49 | diff --git a/libshaderc/README.md b/libshaderc/README.md | ||
50 | index bf9d317..1071769 100644 | ||
51 | --- a/libshaderc/README.md | ||
52 | +++ b/libshaderc/README.md | ||
53 | @@ -7,8 +7,8 @@ A library for compiling shader strings into SPIR-V. | ||
54 | There are two main shaderc libraries that are created during a CMake | ||
55 | compilation. The first is `libshaderc`, which is a static library | ||
56 | containing just the functionality exposed by libshaderc. It depends | ||
57 | -on other compilation targets `glslang`, `OSDependent`, `OGLCompiler`, | ||
58 | -`shaderc_util`, `SPIRV`, `HLSL`, `SPIRV-Tools`, and `SPIRV-Tools-opt`. | ||
59 | +on other compilation targets `glslang`, `shaderc_util`, `SPIRV`, | ||
60 | +`HLSL`, `SPIRV-Tools`, and `SPIRV-Tools-opt`. | ||
61 | |||
62 | The other is `libshaderc_combined`, which is a static library containing | ||
63 | libshaderc and all of its dependencies. | ||
64 | diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt | ||
65 | index 99ce3c4..5291175 100644 | ||
66 | --- a/libshaderc_util/CMakeLists.txt | ||
67 | +++ b/libshaderc_util/CMakeLists.txt | ||
68 | @@ -46,7 +46,7 @@ add_definitions(-DENABLE_HLSL) | ||
69 | |||
70 | find_package(Threads) | ||
71 | target_link_libraries(shaderc_util PRIVATE | ||
72 | - glslang OSDependent OGLCompiler HLSL glslang SPIRV | ||
73 | + glslang HLSL glslang SPIRV | ||
74 | SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) | ||
75 | |||
76 | shaderc_add_tests( | ||
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 35855bd832..4212512034 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 d3fbd6b9427f29606540528d17fe02930cd78d0c Mon Sep 17 00:00:00 2001 | 1 | From 792a46ef27ef879a21c9f01a198eae213ea535e6 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 |
@@ -9,17 +9,16 @@ Subject: [PATCH] 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 | |||
13 | --- | 12 | --- |
14 | CMakeLists.txt | 13 ++++++++++--- | 13 | CMakeLists.txt | 13 ++++++++++--- |
15 | utils/update_build_version.py | 22 +++++++++++++++------- | 14 | utils/update_build_version.py | 22 +++++++++++++++------- |
16 | 2 files changed, 25 insertions(+), 10 deletions(-) | 15 | 2 files changed, 25 insertions(+), 10 deletions(-) |
17 | 16 | ||
18 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 17 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
19 | index 633c244..75b01da 100644 | 18 | index 7bc8f5d..13fc535 100644 |
20 | --- a/CMakeLists.txt | 19 | --- a/CMakeLists.txt |
21 | +++ b/CMakeLists.txt | 20 | +++ b/CMakeLists.txt |
22 | @@ -67,6 +67,7 @@ else() | 21 | @@ -62,6 +62,7 @@ else() |
23 | endif() | 22 | endif() |
24 | 23 | ||
25 | 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) |
@@ -27,7 +26,7 @@ index 633c244..75b01da 100644 | |||
27 | 26 | ||
28 | set (CMAKE_CXX_STANDARD 17) | 27 | set (CMAKE_CXX_STANDARD 17) |
29 | 28 | ||
30 | @@ -129,8 +130,14 @@ endif(MSVC) | 29 | @@ -123,8 +124,14 @@ endif(MSVC) |
31 | 30 | ||
32 | 31 | ||
33 | # Configure subdirectories. | 32 | # Configure subdirectories. |
@@ -44,7 +43,7 @@ index 633c244..75b01da 100644 | |||
44 | 43 | ||
45 | add_subdirectory(libshaderc_util) | 44 | add_subdirectory(libshaderc_util) |
46 | add_subdirectory(libshaderc) | 45 | add_subdirectory(libshaderc) |
47 | @@ -142,7 +149,7 @@ endif() | 46 | @@ -136,7 +143,7 @@ endif() |
48 | add_custom_target(build-version | 47 | add_custom_target(build-version |
49 | ${PYTHON_EXECUTABLE} | 48 | ${PYTHON_EXECUTABLE} |
50 | ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py | 49 | ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py |
@@ -54,7 +53,7 @@ index 633c244..75b01da 100644 | |||
54 | 53 | ||
55 | function(define_pkg_config_file NAME LIBS) | 54 | function(define_pkg_config_file NAME LIBS) |
56 | 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 |
57 | index 5785390..f72b762 100755 | 56 | index 11ee53e..d39e59d 100755 |
58 | --- a/utils/update_build_version.py | 57 | --- a/utils/update_build_version.py |
59 | +++ b/utils/update_build_version.py | 58 | +++ b/utils/update_build_version.py |
60 | @@ -30,6 +30,7 @@ import re | 59 | @@ -30,6 +30,7 @@ import re |
diff --git a/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch b/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch index 0e8ad7e4d2..39f982b7f3 100644 --- a/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch +++ b/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d02ad48d5c9b48af70ddea2e6998081347ef82f3 Mon Sep 17 00:00:00 2001 | 1 | From ec2442940e1d5338971861bb81537bae3a6c19e2 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] libshaderc_util: fix glslang header file location | 4 | Subject: [PATCH] libshaderc_util: fix glslang header file location |
@@ -6,13 +6,12 @@ Subject: [PATCH] libshaderc_util: fix glslang header file location | |||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
8 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | 8 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> |
9 | |||
10 | --- | 9 | --- |
11 | libshaderc_util/src/compiler.cc | 2 +- | 10 | libshaderc_util/src/compiler.cc | 2 +- |
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 12 | ||
14 | diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc | 13 | diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc |
15 | index 051558b..9c4476c 100644 | 14 | index e5f5d10..5fd6d3c 100644 |
16 | --- a/libshaderc_util/src/compiler.cc | 15 | --- a/libshaderc_util/src/compiler.cc |
17 | +++ b/libshaderc_util/src/compiler.cc | 16 | +++ b/libshaderc_util/src/compiler.cc |
18 | @@ -20,7 +20,7 @@ | 17 | @@ -20,7 +20,7 @@ |
diff --git a/meta/recipes-graphics/shaderc/shaderc_2023.7.bb b/meta/recipes-graphics/shaderc/shaderc_2023.8.bb index cf2ced98f0..bc7afbdf5e 100644 --- a/meta/recipes-graphics/shaderc/shaderc_2023.7.bb +++ b/meta/recipes-graphics/shaderc/shaderc_2023.8.bb | |||
@@ -6,11 +6,10 @@ 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 = "3882b16417077aa8eaa7b5775920e7ba4b8a224d" | 9 | SRCREV = "f8a25c591bf5edbb462ca4aea99dcc666f096d13" |
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 \ |
13 | file://0001-CMakeLists.txt-drop-OSDependent-OGLCompiler-from-lis.patch \ | ||
14 | " | 13 | " |
15 | UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$" | 14 | UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$" |
16 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |