diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2020-12-26 10:27:28 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-30 13:57:17 +0000 |
| commit | daaaf5c7163cd30363b21e21d7f6a32ada967dfc (patch) | |
| tree | ee4ad342a578ec04630badab42090d4b18132194 /meta/recipes-graphics/vulkan | |
| parent | 11935507525e9c5c0dd6dcb217bdfee0b07ebba9 (diff) | |
| download | openembedded-core-contrib-daaaf5c7163cd30363b21e21d7f6a32ada967dfc.tar.gz | |
vulkan-loader: upgrade 1.2.154.1 -> 1.2.162.0
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.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.patch | 40 | ||||
| -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 @@ +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} + 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" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.2.154" -SRCREV = "2aa801755eab3fab610d9676c4dd94054e30c854" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git \ + file://0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch \ + " +SRCREV = "7a313093b5c4af964d50a5a64e73d7df6152ea3f" S = "${WORKDIR}/git" |