diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-11-07 15:55:01 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-08 22:47:11 +0000 |
| commit | 354f1c4013f3b7ee78d6f4ed6209d6b549184057 (patch) | |
| tree | 046736181500fbad66ef8158ab74413f5423d7e3 /meta/recipes-graphics/glslang | |
| parent | 4084839ce550a777c93a3481e7db442ddb4ae1f0 (diff) | |
| download | openembedded-core-contrib-354f1c4013f3b7ee78d6f4ed6209d6b549184057.tar.gz | |
vulkan: upgrade 1.3.224.1 -> 1.3.231.1
Update 0001-generate-glslang-pkg-config.patch to
omit libraries that are no longer present
(their functionality has been folded into glslang library
itself).
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 | 14 | ||||
| -rw-r--r-- | meta/recipes-graphics/glslang/glslang_1.3.231.1.bb (renamed from meta/recipes-graphics/glslang/glslang_1.3.224.1.bb) | 2 |
2 files changed, 8 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 b1548c7343..a2dcb13b36 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 7161916f69ae257ce06d9c9bf25abf9709bc55cc Mon Sep 17 00:00:00 2001 +From e8c1b7e1dc6d108a3b49d0adfdc4f836cfafcf1a 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,13 +16,13 @@ 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 45c9813a..cea13975 100644 +index 72e82b48..c6188e12 100644 --- a/glslang/CMakeLists.txt +++ b/glslang/CMakeLists.txt -@@ -221,6 +221,8 @@ if(ENABLE_GLSLANG_INSTALL) - endif() - ") - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) +@@ -223,6 +223,8 @@ if(ENABLE_GLSLANG_INSTALL) + ") + 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) @@ -43,5 +43,5 @@ index 00000000..948a0952 +Description: OpenGL and OpenGL ES shader front end and validator +Requires: +Version: @GLSLANG_VERSION@ -+Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper ++Libs: -L${libdir} -lglslang -lHLSL -lSPVRemapper +Cflags: -I${includedir} diff --git a/meta/recipes-graphics/glslang/glslang_1.3.224.1.bb b/meta/recipes-graphics/glslang/glslang_1.3.231.1.bb index dd8df15fc7..fede2516b1 100644 --- a/meta/recipes-graphics/glslang/glslang_1.3.224.1.bb +++ b/meta/recipes-graphics/glslang/glslang_1.3.231.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 = "10423ec659d301a0ff2daac8bbf38980abf27590" +SRCREV = "5755de46b07e4374c05fb1081f65f7ae1f8cca81" SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \ file://0001-generate-glslang-pkg-config.patch" PE = "1" |