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:23:26 +0100 |
| commit | c9d245a78a22542ea4fb063370974ac1c85be74d (patch) | |
| tree | 90c357e0fe8d7b6a733bf555586e77195b44d56a /meta/recipes-graphics/glslang | |
| parent | ec701b7054a9731ddd4f44fe39457054fd790e09 (diff) | |
| download | openembedded-core-contrib-c9d245a78a22542ea4fb063370974ac1c85be74d.tar.gz | |
vulkan: update 1.3.216.0 -> 1.3.224.1
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
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 @@ -From 6692611126b40d499c94bbcc8e29604560262072 Mon Sep 17 00:00:00 2001 +From 7161916f69ae257ce06d9c9bf25abf9709bc55cc Mon Sep 17 00:00:00 2001 From: Jose Quaresma <quaresma.jose@gmail.com> Date: Sun, 7 Feb 2021 01:30:39 +0000 Subject: [PATCH] generate glslang pkg-config @@ -16,21 +16,21 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> create mode 100644 glslang/glslang.pc.cmake.in diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index 1c7d22a2..10c1e841 100644 +index 45c9813a..cea13975 100644 --- a/glslang/CMakeLists.txt +++ b/glslang/CMakeLists.txt -@@ -209,6 +209,8 @@ if(ENABLE_GLSLANG_INSTALL) - EXPORT glslangTargets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() +@@ -221,6 +221,8 @@ if(ENABLE_GLSLANG_INSTALL) + endif() + ") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - + set(ALL_HEADERS + ${GLSLANG_HEADERS} diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in new file mode 100644 -index 00000000..64b6882d +index 00000000..948a0952 --- /dev/null +++ b/glslang/glslang.pc.cmake.in @@ -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" LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" -SRCREV = "adbf0d3106b26daa237b10b9bf72b1af7c31092d" +SRCREV = "10423ec659d301a0ff2daac8bbf38980abf27590" SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \ file://0001-generate-glslang-pkg-config.patch" PE = "1" |