summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/vulkan
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2021-03-18 11:34:39 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-20 18:54:56 +0000
commit255c92a4cf49ee07c171c9ba6cfdd5b7a0dfd1af (patch)
treeeb04ff3ddfe02066175d334f35b46e7549289fef /meta/recipes-graphics/vulkan
parent28fdf9c6c3119a586357e06855852b570796e805 (diff)
downloadpoky-255c92a4cf49ee07c171c9ba6cfdd5b7a0dfd1af.tar.gz
vulkan-loader: upgrade 1.2.162.0 -> 1.2.170.0
0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch removed since it is included in 1.2.170.0 (From OE-Core rev: aff97c5263d7261150ecbda3bb0b5ff7a586146c) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/vulkan')
-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.170.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-loader_1.2.162.0.bb)5
2 files changed, 3 insertions, 42 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
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 @@
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.162.0.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bb
index d39e7af975..6b6ed06dbb 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
@@ -10,9 +10,8 @@ SECTION = "libs"
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 \ 12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git \
13 file://0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch \
14 " 13 "
15SRCREV = "7a313093b5c4af964d50a5a64e73d7df6152ea3f" 14SRCREV = "c5678a03db383fd0dc5bfb8e9a383043bdbcb57b"
16 15
17S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
18 17
@@ -27,6 +26,8 @@ EXTRA_OECMAKE = "\
27 -DBUILD_TESTS=OFF \ 26 -DBUILD_TESTS=OFF \
28 -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ 27 -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
29 -DASSEMBLER_WORKS=FALSE \ 28 -DASSEMBLER_WORKS=FALSE \
29 -DVulkanHeaders_INCLUDE_DIR=${STAGING_INCDIR} \
30 -DVulkanRegistry_DIR=${RECIPE_SYSROOT}/${datadir} \
30 " 31 "
31 32
32# must choose x11 or wayland or both 33# must choose x11 or wayland or both