From aff97c5263d7261150ecbda3bb0b5ff7a586146c Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Thu, 18 Mar 2021 11:34:39 +0800 Subject: 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 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- ...01-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch | 40 --------------------- .../vulkan/vulkan-loader_1.2.162.0.bb | 40 --------------------- .../vulkan/vulkan-loader_1.2.170.0.bb | 41 ++++++++++++++++++++++ 3 files changed, 41 insertions(+), 80 deletions(-) delete mode 100644 meta/recipes-graphics/vulkan/vulkan-loader/0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch delete mode 100644 meta/recipes-graphics/vulkan/vulkan-loader_1.2.162.0.bb create mode 100644 meta/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bb (limited to 'meta/recipes-graphics') 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 -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 ---- - 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.162.0.bb deleted file mode 100644 index d39e7af975..0000000000 --- a/meta/recipes-graphics/vulkan/vulkan-loader_1.2.162.0.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "3D graphics and compute API common loader" -DESCRIPTION = "Vulkan is a new generation graphics and compute API \ -that provides efficient access to modern GPUs. These packages \ -provide only the common vendor-agnostic library loader, headers and \ -the vulkaninfo utility." -HOMEPAGE = "https://www.khronos.org/vulkan/" -BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Loader" -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" - -S = "${WORKDIR}/git" - -REQUIRED_DISTRO_FEATURES = "vulkan" - -inherit cmake features_check -ANY_OF_DISTRO_FEATURES = "x11 wayland" - -DEPENDS += "vulkan-headers" - -EXTRA_OECMAKE = "\ - -DBUILD_TESTS=OFF \ - -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ - -DASSEMBLER_WORKS=FALSE \ - " - -# must choose x11 or wayland or both -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" - -PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" -PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" - -RRECOMMENDS_${PN} = "mesa-vulkan-drivers" - -UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bb new file mode 100644 index 0000000000..6b6ed06dbb --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bb @@ -0,0 +1,41 @@ +SUMMARY = "3D graphics and compute API common loader" +DESCRIPTION = "Vulkan is a new generation graphics and compute API \ +that provides efficient access to modern GPUs. These packages \ +provide only the common vendor-agnostic library loader, headers and \ +the vulkaninfo utility." +HOMEPAGE = "https://www.khronos.org/vulkan/" +BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Loader" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git \ + " +SRCREV = "c5678a03db383fd0dc5bfb8e9a383043bdbcb57b" + +S = "${WORKDIR}/git" + +REQUIRED_DISTRO_FEATURES = "vulkan" + +inherit cmake features_check +ANY_OF_DISTRO_FEATURES = "x11 wayland" + +DEPENDS += "vulkan-headers" + +EXTRA_OECMAKE = "\ + -DBUILD_TESTS=OFF \ + -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ + -DASSEMBLER_WORKS=FALSE \ + -DVulkanHeaders_INCLUDE_DIR=${STAGING_INCDIR} \ + -DVulkanRegistry_DIR=${RECIPE_SYSROOT}/${datadir} \ + " + +# must choose x11 or wayland or both +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" + +PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" +PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" + +RRECOMMENDS_${PN} = "mesa-vulkan-drivers" + +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" -- cgit 1.2.3-korg