summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-12-26 10:27:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-30 14:01:07 +0000
commitb6e0aafcf524a4fffb248f215993074c2a10af7a (patch)
tree43f764aaa0f2599a960ed700bcd6c818efdf70cd
parentec7bc4a26cc59778b97748005cc9f0351336f5d4 (diff)
downloadpoky-b6e0aafcf524a4fffb248f215993074c2a10af7a.tar.gz
vulkan-loader: upgrade 1.2.154.1 -> 1.2.162.0
(From OE-Core rev: daaaf5c7163cd30363b21e21d7f6a32ada967dfc) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-loader/0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch40
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-loader_1.2.162.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-loader_1.2.154.1.bb)6
2 files changed, 44 insertions, 2 deletions
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
new file mode 100644
index 0000000000..26b1a40f26
--- /dev/null
+++ b/meta/recipes-graphics/vulkan/vulkan-loader/0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch
@@ -0,0 +1,40 @@
1From 5ae24ece75f2caa69216da7075334711642f5588 Mon Sep 17 00:00:00 2001
2From: Michel Zou <xantares09@hotmail.com>
3Date: Wed, 16 Dec 2020 15:03:23 +0100
4Subject: [PATCH] Rename LIB_SUFFIX to VULKAN_LIB_SUFFIX
5
6Closes #527
7
8Upstream-Status: Backport [https://github.com/KhronosGroup/Vulkan-Loader/commit/66a23ac8c566299343668f094de50798a5f4a0e4]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 loader/CMakeLists.txt | 2 +-
12 loader/vulkan.pc.in | 2 +-
13 2 files changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
16index 659511855..ba9f460f1 100644
17--- a/loader/CMakeLists.txt
18+++ b/loader/CMakeLists.txt
19@@ -327,7 +327,7 @@ if(PKG_CONFIG_FOUND)
20 set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
21 endforeach()
22 if(WIN32)
23- set(LIB_SUFFIX "-1")
24+ set(VULKAN_LIB_SUFFIX "-1")
25 endif ()
26 configure_file("vulkan.pc.in" "vulkan.pc" @ONLY)
27 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
28diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in
29index fc17cb1f3..44049ee34 100644
30--- a/loader/vulkan.pc.in
31+++ b/loader/vulkan.pc.in
32@@ -6,7 +6,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
33 Name: @CMAKE_PROJECT_NAME@
34 Description: Vulkan Loader
35 Version: @VK_API_VERSION@
36-Libs: -L${libdir} -lvulkan@LIB_SUFFIX@
37+Libs: -L${libdir} -lvulkan@VULKAN_LIB_SUFFIX@
38 Libs.private: @PRIVATE_LIBS@
39 Cflags: -I${includedir}
40
diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.2.154.1.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.2.162.0.bb
index 23bf59f8a6..d39e7af975 100644
--- a/meta/recipes-graphics/vulkan/vulkan-loader_1.2.154.1.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.2.162.0.bb
@@ -9,8 +9,10 @@ SECTION = "libs"
9 9
10LICENSE = "Apache-2.0" 10LICENSE = "Apache-2.0"
11LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" 11LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.2.154" 12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git \
13SRCREV = "2aa801755eab3fab610d9676c4dd94054e30c854" 13 file://0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch \
14 "
15SRCREV = "7a313093b5c4af964d50a5a64e73d7df6152ea3f"
14 16
15S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
16 18