Signed-off-by: Alexander Kanavin <[email protected]>
---
...2.162.0.bb => vulkan-headers_1.2.170.0.bb} | 2 +-
...name-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch | 40 -------------------
....2.162.0.bb => vulkan-loader_1.2.170.0.bb} | 7 ++--
...1.2.162.1.bb => vulkan-tools_1.2.170.0.bb} | 4 +-
4 files changed, 6 insertions(+), 47 deletions(-)
rename meta/recipes-graphics/vulkan/{vulkan-headers_1.2.162.0.bb =>
vulkan-headers_1.2.170.0.bb} (93%)
delete mode 100644
meta/recipes-graphics/vulkan/vulkan-loader/0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch
rename meta/recipes-graphics/vulkan/{vulkan-loader_1.2.162.0.bb =>
vulkan-loader_1.2.170.0.bb} (87%)
rename meta/recipes-graphics/vulkan/{vulkan-tools_1.2.162.1.bb =>
vulkan-tools_1.2.170.0.bb} (89%)
diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.2.162.0.bb
b/meta/recipes-graphics/vulkan/vulkan-headers_1.2.170.0.bb
similarity index 93%
rename from meta/recipes-graphics/vulkan/vulkan-headers_1.2.162.0.bb
rename to meta/recipes-graphics/vulkan/vulkan-headers_1.2.170.0.bb
index 19ae67cdd4..4c9c94f3d2 100644
--- a/meta/recipes-graphics/vulkan/vulkan-headers_1.2.162.0.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.2.170.0.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=master"
-SRCREV = "87aaa16d4c8e1ac70f8f04acdcd46eed4bd77209"
+SRCREV = "1d99b835ec3cd5a7fb2f2a2dd9a615ee2d1f0101"
S = "${WORKDIR}/git"
diff --git
a/meta/recipes-graphics/vulkan/vulkan-loader/0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch
b/meta/recipes-graphics/vulkan/vulkan-loader/0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch
deleted file mode 100644
index 26b1a40f26..0000000000
---
a/meta/recipes-graphics/vulkan/vulkan-loader/0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5ae24ece75f2caa69216da7075334711642f5588 Mon Sep 17 00:00:00 2001
-From: Michel Zou <[email protected]>
-Date: Wed, 16 Dec 2020 15:03:23 +0100
-Subject: [PATCH] Rename LIB_SUFFIX to VULKAN_LIB_SUFFIX
-
-Closes #527
-
-Upstream-Status: Backport
[https://github.com/KhronosGroup/Vulkan-Loader/commit/66a23ac8c566299343668f094de50798a5f4a0e4]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- loader/CMakeLists.txt | 2 +-
- loader/vulkan.pc.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index 659511855..ba9f460f1 100644
---- a/loader/CMakeLists.txt
-+++ b/loader/CMakeLists.txt
-@@ -327,7 +327,7 @@ if(PKG_CONFIG_FOUND)
- set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
- endforeach()
- if(WIN32)
-- set(LIB_SUFFIX "-1")
-+ set(VULKAN_LIB_SUFFIX "-1")
- endif ()
- configure_file("vulkan.pc.in" "vulkan.pc" @ONLY)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION
"${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in
-index fc17cb1f3..44049ee34 100644
---- a/loader/vulkan.pc.in
-+++ b/loader/vulkan.pc.in
-@@ -6,7 +6,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- Name: @CMAKE_PROJECT_NAME@
- Description: Vulkan Loader
- Version: @VK_API_VERSION@
--Libs: -L${libdir} -lvulkan@LIB_SUFFIX@
-+Libs: -L${libdir} -lvulkan@VULKAN_LIB_SUFFIX@
- Libs.private: @PRIVATE_LIBS@
- Cflags: -I${includedir}
-
diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.2.162.0.bb
b/meta/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bb
similarity index 87%
rename from meta/recipes-graphics/vulkan/vulkan-loader_1.2.162.0.bb
rename to meta/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bb
index d39e7af975..0f43650698 100644
--- a/meta/recipes-graphics/vulkan/vulkan-loader_1.2.162.0.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bb
@@ -9,10 +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 \
- file://0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch \
- "
-SRCREV = "7a313093b5c4af964d50a5a64e73d7df6152ea3f"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git"
+SRCREV = "c5678a03db383fd0dc5bfb8e9a383043bdbcb57b"
S = "${WORKDIR}/git"
@@ -27,6 +25,7 @@ EXTRA_OECMAKE = "\
-DBUILD_TESTS=OFF \
-DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
-DASSEMBLER_WORKS=FALSE \
+ -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \
"
# must choose x11 or wayland or both
diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.2.162.1.bb
b/meta/recipes-graphics/vulkan/vulkan-tools_1.2.170.0.bb
similarity index 89%
rename from meta/recipes-graphics/vulkan/vulkan-tools_1.2.162.1.bb
rename to meta/recipes-graphics/vulkan/vulkan-tools_1.2.170.0.bb
index a5c3bbcb14..9079d921a7 100644
--- a/meta/recipes-graphics/vulkan/vulkan-tools_1.2.162.1.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.2.170.0.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=sdk-1.2.162"
-SRCREV = "8f0c2e40d4134f53f82ce48de72c7be92baa6b3d"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git"
+SRCREV = "88ea55de928a08ba5c5f65a93d1e7c8f666fc43f"
S = "${WORKDIR}/git"
--
2.29.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#149662):
https://lists.openembedded.org/g/openembedded-core/message/149662
Mute This Topic: https://lists.openembedded.org/mt/81450931/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
