mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
28fdf9c6c3
commit
255c92a4cf
-40
@@ -1,40 +0,0 @@
|
|||||||
From 5ae24ece75f2caa69216da7075334711642f5588 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michel Zou <xantares09@hotmail.com>
|
|
||||||
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 <alex.kanavin@gmail.com>
|
|
||||||
---
|
|
||||||
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}
|
|
||||||
|
|
||||||
+3
-2
@@ -10,9 +10,8 @@ SECTION = "libs"
|
|||||||
LICENSE = "Apache-2.0"
|
LICENSE = "Apache-2.0"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
|
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
|
||||||
SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git \
|
SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git \
|
||||||
file://0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch \
|
|
||||||
"
|
"
|
||||||
SRCREV = "7a313093b5c4af964d50a5a64e73d7df6152ea3f"
|
SRCREV = "c5678a03db383fd0dc5bfb8e9a383043bdbcb57b"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
@@ -27,6 +26,8 @@ EXTRA_OECMAKE = "\
|
|||||||
-DBUILD_TESTS=OFF \
|
-DBUILD_TESTS=OFF \
|
||||||
-DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
|
-DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
|
||||||
-DASSEMBLER_WORKS=FALSE \
|
-DASSEMBLER_WORKS=FALSE \
|
||||||
|
-DVulkanHeaders_INCLUDE_DIR=${STAGING_INCDIR} \
|
||||||
|
-DVulkanRegistry_DIR=${RECIPE_SYSROOT}/${datadir} \
|
||||||
"
|
"
|
||||||
|
|
||||||
# must choose x11 or wayland or both
|
# must choose x11 or wayland or both
|
||||||
Reference in New Issue
Block a user