diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-10-27 22:15:56 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-10-29 16:28:35 +0100 |
commit | 491c56d06c557a9f5fcfb12b8df8ee9f929ab795 (patch) | |
tree | a25a632a6d1ed8e008f09ce95aadd57fcd874f3c /meta/recipes-graphics/glslang | |
parent | 4515da64cc0dc0e1bb8daf6023484a50c03bddd4 (diff) | |
download | poky-491c56d06c557a9f5fcfb12b8df8ee9f929ab795.tar.gz |
vulkan: update 1.3.216.0 -> 1.3.224.1
(From OE-Core rev: c9d245a78a22542ea4fb063370974ac1c85be74d)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
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 | 18 | ||||
-rw-r--r-- | meta/recipes-graphics/glslang/glslang_1.3.224.1.bb (renamed from meta/recipes-graphics/glslang/glslang_1.3.216.0.bb) | 2 |
2 files changed, 10 insertions, 10 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 cddd330971..b1548c7343 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 6692611126b40d499c94bbcc8e29604560262072 Mon Sep 17 00:00:00 2001 | 1 | From 7161916f69ae257ce06d9c9bf25abf9709bc55cc 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 |
@@ -16,21 +16,21 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | |||
16 | create mode 100644 glslang/glslang.pc.cmake.in | 16 | create mode 100644 glslang/glslang.pc.cmake.in |
17 | 17 | ||
18 | diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt | 18 | diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt |
19 | index 1c7d22a2..10c1e841 100644 | 19 | index 45c9813a..cea13975 100644 |
20 | --- a/glslang/CMakeLists.txt | 20 | --- a/glslang/CMakeLists.txt |
21 | +++ b/glslang/CMakeLists.txt | 21 | +++ b/glslang/CMakeLists.txt |
22 | @@ -209,6 +209,8 @@ if(ENABLE_GLSLANG_INSTALL) | 22 | @@ -221,6 +221,8 @@ if(ENABLE_GLSLANG_INSTALL) |
23 | EXPORT glslangTargets | 23 | endif() |
24 | ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) | 24 | ") |
25 | endif() | 25 | install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) |
26 | + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) | 26 | + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) |
27 | + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) | 27 | + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) |
28 | 28 | ||
29 | install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) | 29 | set(ALL_HEADERS |
30 | 30 | ${GLSLANG_HEADERS} | |
31 | diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in | 31 | diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in |
32 | new file mode 100644 | 32 | new file mode 100644 |
33 | index 00000000..64b6882d | 33 | index 00000000..948a0952 |
34 | --- /dev/null | 34 | --- /dev/null |
35 | +++ b/glslang/glslang.pc.cmake.in | 35 | +++ b/glslang/glslang.pc.cmake.in |
36 | @@ -0,0 +1,11 @@ | 36 | @@ -0,0 +1,11 @@ |
diff --git a/meta/recipes-graphics/glslang/glslang_1.3.216.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.224.1.bb index 69d9a0a84e..dd8df15fc7 100644 --- a/meta/recipes-graphics/glslang/glslang_1.3.216.0.bb +++ b/meta/recipes-graphics/glslang/glslang_1.3.224.1.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 = "adbf0d3106b26daa237b10b9bf72b1af7c31092d" | 11 | SRCREV = "10423ec659d301a0ff2daac8bbf38980abf27590" |
12 | SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \ | 12 | SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \ |
13 | file://0001-generate-glslang-pkg-config.patch" | 13 | file://0001-generate-glslang-pkg-config.patch" |
14 | PE = "1" | 14 | PE = "1" |