From 679c4cf80bdfddbe338046c643f6ee4f3dba4d6d Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 30 Jul 2021 05:59:00 +1000 Subject: [PATCH] Update to 1.2.182.0 loader Resolves: rhbz1984256 --- .gitignore | 1 + fix-vulkan-loader.patch | 37 ------------------------------------- sources | 2 +- vulkan-loader.spec | 10 +++++----- 4 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 fix-vulkan-loader.patch diff --git a/.gitignore b/.gitignore index 7136118..ddc21d5 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /Vulkan-Loader-sdk-1.2.148.1.tar.gz /Vulkan-Loader-sdk-1.2.154.1.tar.gz /Vulkan-Loader-sdk-1.2.162.0.tar.gz +/Vulkan-Loader-sdk-1.2.182.0.tar.gz diff --git a/fix-vulkan-loader.patch b/fix-vulkan-loader.patch deleted file mode 100644 index a629800..0000000 --- a/fix-vulkan-loader.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 66a23ac8c566299343668f094de50798a5f4a0e4 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 ---- - 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/sources b/sources index 2d8a06d..9dc79e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Vulkan-Loader-sdk-1.2.162.0.tar.gz) = 13e2ff119828cadf87aad0f2c54a577801ff817fcaa10c11e3c2af768a1e2809ffff9b14c63cd0993cc1d9458f06d69b7949ab024eecf8141c794c394e8a6542 +SHA512 (Vulkan-Loader-sdk-1.2.182.0.tar.gz) = 7b84cf8c6f507f6d1ef7d05deda763211616b252a7cc0f5984d77cdef625d0fb166f645f6a5ff95e47516405c413c5efdc2a49f0f0a7dff4852e6447e1aa9396 diff --git a/vulkan-loader.spec b/vulkan-loader.spec index a003e82..3cffca6 100644 --- a/vulkan-loader.spec +++ b/vulkan-loader.spec @@ -1,15 +1,12 @@ Name: vulkan-loader -Version: 1.2.162.0 -Release: 3%{?dist} +Version: 1.2.182.0 +Release: 1%{?dist} Summary: Vulkan ICD desktop loader License: ASL 2.0 URL: https://github.com/KhronosGroup/Vulkan-Loader Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-Loader-sdk-%{version}.tar.gz -# vulkan loader fix from github -Patch1: fix-vulkan-loader.patch - BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake3 @@ -94,6 +91,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \ %changelog +* Fri Jul 30 2021 Dave Airlie - 1.2.182.0-1 +- Update to 1.2.182.0 loader + * Fri Apr 16 2021 Mohan Boddu - 1.2.162.0-3 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937