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 <a...@linutronix.de>
---
.../glslang/0001-generate-glslang-pkg-config.patch | 14 +++++++-------
.../{glslang_1.3.224.1.bb => glslang_1.3.231.1.bb} | 2 +-
...ers_1.3.224.1.bb => spirv-headers_1.3.231.1.bb} | 2 +-
...tools_1.3.224.1.bb => spirv-tools_1.3.231.1.bb} | 2 +-
...rs_1.3.224.1.bb => vulkan-headers_1.3.231.1.bb} | 2 +-
...der_1.3.224.1.bb => vulkan-loader_1.3.231.1.bb} | 4 ++--
...ools_1.3.224.1.bb => vulkan-tools_1.3.231.1.bb} | 4 ++--
7 files changed, 15 insertions(+), 15 deletions(-)
rename meta/recipes-graphics/glslang/{glslang_1.3.224.1.bb =>
glslang_1.3.231.1.bb} (95%)
rename meta/recipes-graphics/spir/{spirv-headers_1.3.224.1.bb =>
spirv-headers_1.3.231.1.bb} (92%)
rename meta/recipes-graphics/spir/{spirv-tools_1.3.224.1.bb =>
spirv-tools_1.3.231.1.bb} (96%)
rename meta/recipes-graphics/vulkan/{vulkan-headers_1.3.224.1.bb =>
vulkan-headers_1.3.231.1.bb} (93%)
rename meta/recipes-graphics/vulkan/{vulkan-loader_1.3.224.1.bb =>
vulkan-loader_1.3.231.1.bb} (94%)
rename meta/recipes-graphics/vulkan/{vulkan-tools_1.3.224.1.bb =>
vulkan-tools_1.3.231.1.bb} (93%)
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.j...@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.j...@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
similarity index 95%
rename from meta/recipes-graphics/glslang/glslang_1.3.224.1.bb
rename to 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"
diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.224.1.bb
b/meta/recipes-graphics/spir/spirv-headers_1.3.231.1.bb
similarity index 92%
rename from meta/recipes-graphics/spir/spirv-headers_1.3.224.1.bb
rename to meta/recipes-graphics/spir/spirv-headers_1.3.231.1.bb
index 94500a96ba..fdcc8d523f 100644
--- a/meta/recipes-graphics/spir/spirv-headers_1.3.224.1.bb
+++ b/meta/recipes-graphics/spir/spirv-headers_1.3.231.1.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v";
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
-SRCREV = "b2a156e1c0434bc8c99aaebba1c7be98be7ac580"
+SRCREV = "85a1ed200d50660786c1a88d9166e871123cce39"
SRC_URI =
"git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=master"
PE = "1"
UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.224.1.bb
b/meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb
similarity index 96%
rename from meta/recipes-graphics/spir/spirv-tools_1.3.224.1.bb
rename to meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb
index cfea28a6ef..ea47796543 100644
--- a/meta/recipes-graphics/spir/spirv-tools_1.3.224.1.bb
+++ b/meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb
@@ -7,7 +7,7 @@ SECTION = "graphics"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRCREV = "5e61ea2098220059e89523f1f47b0bcd8c33b89a"
+SRCREV = "eb0a36633d2acf4de82588504f951ad0f2cecacb"
SRC_URI =
"git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https"
PE = "1"
UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.224.1.bb
b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.231.1.bb
similarity index 93%
rename from meta/recipes-graphics/vulkan/vulkan-headers_1.3.224.1.bb
rename to meta/recipes-graphics/vulkan/vulkan-headers_1.3.231.1.bb
index 8d34738ad7..b41b82af9d 100644
--- a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.224.1.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.231.1.bb
@@ -11,7 +11,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI =
"git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https"
-SRCREV = "c896e2f920273bfee852da9cca2a356bc1c2031e"
+SRCREV = "98f440ce6868c94f5ec6e198cc1adda4760e8849"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.224.1.bb
b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.231.1.bb
similarity index 94%
rename from meta/recipes-graphics/vulkan/vulkan-loader_1.3.224.1.bb
rename to meta/recipes-graphics/vulkan/vulkan-loader_1.3.231.1.bb
index f24db87962..59c52c1db7 100644
--- a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.224.1.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.231.1.bb
@@ -9,8 +9,8 @@ SECTION = "libs"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
-SRC_URI =
"git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.224;protocol=https"
-SRCREV = "09afdf64210b11ec653a1001e013b5af4fce8559"
+SRC_URI =
"git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.231;protocol=https"
+SRCREV = "eedbf08292a6be19c3527e77ae2df3f209cab285"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.224.1.bb
b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.231.1.bb
similarity index 93%
rename from meta/recipes-graphics/vulkan/vulkan-tools_1.3.224.1.bb
rename to meta/recipes-graphics/vulkan/vulkan-tools_1.3.231.1.bb
index bed10afef1..9066821de0 100644
--- a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.224.1.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.231.1.bb
@@ -6,8 +6,8 @@ SECTION = "libs"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI =
"git://github.com/KhronosGroup/Vulkan-Tools.git;branch=master;protocol=https"
-SRCREV = "497f232680b046db34ba9e9da065e6303a125851"
+SRC_URI =
"git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.3.231;protocol=https"
+SRCREV = "8d2d3e22d684540fdc5a76c15e456fc2fd11e4b7"
S = "${WORKDIR}/git"
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#172891):
https://lists.openembedded.org/g/openembedded-core/message/172891
Mute This Topic: https://lists.openembedded.org/mt/94867617/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
