summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/glslang
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-11-07 15:55:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-11-08 22:47:17 +0000
commit445d2b967e621dd2d395c56a628cc68286213a06 (patch)
tree398124e9dcc3741349f9b84540fcadbfd43a71c5 /meta/recipes-graphics/glslang
parentae6305aa989a4b81b27545b72a6339da3fc9a2da (diff)
downloadpoky-445d2b967e621dd2d395c56a628cc68286213a06.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). (From OE-Core rev: 354f1c4013f3b7ee78d6f4ed6209d6b549184057) 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.patch14
-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 @@
1From 7161916f69ae257ce06d9c9bf25abf9709bc55cc Mon Sep 17 00:00:00 2001 1From e8c1b7e1dc6d108a3b49d0adfdc4f836cfafcf1a Mon Sep 17 00:00:00 2001
2From: Jose Quaresma <quaresma.jose@gmail.com> 2From: Jose Quaresma <quaresma.jose@gmail.com>
3Date: Sun, 7 Feb 2021 01:30:39 +0000 3Date: Sun, 7 Feb 2021 01:30:39 +0000
4Subject: [PATCH] generate glslang pkg-config 4Subject: [PATCH] generate glslang pkg-config
@@ -16,13 +16,13 @@ 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
18diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt 18diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
19index 45c9813a..cea13975 100644 19index 72e82b48..c6188e12 100644
20--- a/glslang/CMakeLists.txt 20--- a/glslang/CMakeLists.txt
21+++ b/glslang/CMakeLists.txt 21+++ b/glslang/CMakeLists.txt
22@@ -221,6 +221,8 @@ if(ENABLE_GLSLANG_INSTALL) 22@@ -223,6 +223,8 @@ if(ENABLE_GLSLANG_INSTALL)
23 endif() 23 ")
24 ") 24 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
25 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) 25 endif()
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
@@ -43,5 +43,5 @@ index 00000000..948a0952
43+Description: OpenGL and OpenGL ES shader front end and validator 43+Description: OpenGL and OpenGL ES shader front end and validator
44+Requires: 44+Requires:
45+Version: @GLSLANG_VERSION@ 45+Version: @GLSLANG_VERSION@
46+Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper 46+Libs: -L${libdir} -lglslang -lHLSL -lSPVRemapper
47+Cflags: -I${includedir} 47+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"
8LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" 8LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception"
9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" 9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3"
10 10
11SRCREV = "10423ec659d301a0ff2daac8bbf38980abf27590" 11SRCREV = "5755de46b07e4374c05fb1081f65f7ae1f8cca81"
12SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \ 12SRC_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"
14PE = "1" 14PE = "1"