diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2024-03-27 11:20:55 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-16 08:07:02 +0100 |
commit | ebf8852175637c5f15e3371d1b5e743ad96d91ff (patch) | |
tree | fb0284b29438c06fac208baf13642a9e7d3a3dc4 /meta/recipes-graphics/glslang | |
parent | 13b4c46ddf2b903e704a7931cf47ff876b0ece9a (diff) | |
download | poky-ebf8852175637c5f15e3371d1b5e743ad96d91ff.tar.gz |
vulkan: upgrade 1.3.275.0 -> 1.3.280.0
0001-generate-glslang-pkg-config.patch
refreshed for 1.3.280.0
License-Update:
===============
spirv-headers:License-Update: List all licenses in the root LICENSE file.
vulkan-volk:Copyright year updated to 2024.
(From OE-Core rev: ca21778738e0e9e5f60324cdb21ffe88d7b1f9a0)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/glslang')
-rw-r--r-- | meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch | 10 | ||||
-rw-r--r-- | meta/recipes-graphics/glslang/glslang_1.3.280.0.bb (renamed from meta/recipes-graphics/glslang/glslang_1.3.275.0.bb) | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch index 316a57fa4a..e6bb6ec8e3 100644 --- a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch +++ b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4cede5edcff96134baf35953d58595c4aa5f1fc5 Mon Sep 17 00:00:00 2001 | 1 | From fc33f1cf032a15c07044ef932bc991c346d62d62 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: Sun, 7 Feb 2021 01:30:39 +0000 | 3 | Date: Sun, 7 Feb 2021 01:30:39 +0000 |
4 | Subject: [PATCH] generate glslang pkg-config | 4 | Subject: [PATCH] generate glslang pkg-config |
@@ -15,12 +15,12 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | |||
15 | create mode 100644 glslang/glslang.pc.cmake.in | 15 | create mode 100644 glslang/glslang.pc.cmake.in |
16 | 16 | ||
17 | diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt | 17 | diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt |
18 | index 37eecaad..6974935c 100644 | 18 | index e4690f09..8e660bc5 100644 |
19 | --- a/glslang/CMakeLists.txt | 19 | --- a/glslang/CMakeLists.txt |
20 | +++ b/glslang/CMakeLists.txt | 20 | +++ b/glslang/CMakeLists.txt |
21 | @@ -251,6 +251,8 @@ if(PROJECT_IS_TOP_LEVEL) | 21 | @@ -233,6 +233,8 @@ if(GLSLANG_ENABLE_INSTALL) |
22 | ") | 22 | install(TARGETS MachineIndependent EXPORT glslang-targets) |
23 | install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) | 23 | install(TARGETS GenericCodeGen EXPORT glslang-targets) |
24 | endif() | 24 | endif() |
25 | + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) | 25 | + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) |
26 | + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) | 26 | + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) |
diff --git a/meta/recipes-graphics/glslang/glslang_1.3.275.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.280.0.bb index 2fd1e72a26..637082c719 100644 --- a/meta/recipes-graphics/glslang/glslang_1.3.275.0.bb +++ b/meta/recipes-graphics/glslang/glslang_1.3.280.0.bb | |||
@@ -8,7 +8,7 @@ HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" | |||
8 | LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" | 8 | LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" |
9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" | 9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" |
10 | 10 | ||
11 | SRCREV = "a91631b260cba3f22858d6c6827511e636c2458a" | 11 | SRCREV = "ee2f5d09eaf8f4e8d0d598bd2172fce290d4ca60" |
12 | SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ | 12 | SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ |
13 | file://0001-generate-glslang-pkg-config.patch \ | 13 | file://0001-generate-glslang-pkg-config.patch \ |
14 | " | 14 | " |