diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-06 07:42:27 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-06 16:23:34 +0000 |
| commit | d3d0375fa0b4809d2c69837faf5df297d92de683 (patch) | |
| tree | aeb13075692d62850d9c90f68810a3e0093aeaac /meta/recipes-graphics/glslang | |
| parent | 7235073a7ee2fb371931922c2d0f28ab09673102 (diff) | |
| download | openembedded-core-d3d0375fa0b4809d2c69837faf5df297d92de683.tar.gz | |
vulkan: upgrade 1.3.268.0 -> 1.3.275.0
Add vulkan-volk recipe to support building latest vulkan-tools.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
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 | 13 | ||||
| -rw-r--r-- | meta/recipes-graphics/glslang/glslang_1.3.275.0.bb (renamed from meta/recipes-graphics/glslang/glslang_1.3.268.0.bb) | 2 |
2 files changed, 7 insertions, 8 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 a2dcb13b36..316a57fa4a 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 e8c1b7e1dc6d108a3b49d0adfdc4f836cfafcf1a Mon Sep 17 00:00:00 2001 +From 4cede5edcff96134baf35953d58595c4aa5f1fc5 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 @@ -8,7 +8,6 @@ Based on https://src.fedoraproject.org/rpms/glslang/blob/main/f/0001-pkg-config- Upstream-Status: Pending Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> - --- glslang/CMakeLists.txt | 2 ++ glslang/glslang.pc.cmake.in | 11 +++++++++++ @@ -16,21 +15,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 72e82b48..c6188e12 100644 +index 37eecaad..6974935c 100644 --- a/glslang/CMakeLists.txt +++ b/glslang/CMakeLists.txt -@@ -223,6 +223,8 @@ if(ENABLE_GLSLANG_INSTALL) +@@ -251,6 +251,8 @@ if(PROJECT_IS_TOP_LEVEL) ") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) endif() + 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) - set(ALL_HEADERS - ${GLSLANG_HEADERS} + set(PUBLIC_HEADERS + Public/ResourceLimits.h diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in new file mode 100644 -index 00000000..948a0952 +index 00000000..43104e68 --- /dev/null +++ b/glslang/glslang.pc.cmake.in @@ -0,0 +1,11 @@ diff --git a/meta/recipes-graphics/glslang/glslang_1.3.268.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.275.0.bb index 033830ba36..2fd1e72a26 100644 --- a/meta/recipes-graphics/glslang/glslang_1.3.268.0.bb +++ b/meta/recipes-graphics/glslang/glslang_1.3.275.0.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 = "36d08c0d940cf307a23928299ef52c7970d8cee6" +SRCREV = "a91631b260cba3f22858d6c6827511e636c2458a" SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ file://0001-generate-glslang-pkg-config.patch \ " |