[crux-commits] ports/opt (3.6): vulkan-loader: 1.2.174 -> 1.2.176

crux at crux.nu crux at crux.nu
Thu Apr 22 12:48:23 UTC 2021


commit 31d886e023300b2c5c87d74b5646e69775fe4120
Author: Danny Rawlins <contact at romster.me>
Date:   Thu Apr 22 20:51:24 2021 +1000

    vulkan-loader: 1.2.174 -> 1.2.176

diff --git a/vulkan-loader/.signature b/vulkan-loader/.signature
index 668e36443..1e495ab24 100644
--- a/vulkan-loader/.signature
+++ b/vulkan-loader/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/QUggKrcOGAdpOEzDvPXm8KZ3eBHKNYoPZ2f8+pfFCHzvhwehw1j86btlY2uYbt9hb61ZRXRLcXar5Z/XNEozgc=
-SHA256 (Pkgfile) = e17a9978ab3f473ce206c1e89af64f1c385149352e712a37badc95bf18ed1ad2
+RWSE3ohX2g5d/bz6WbfI6h3BVbjjeO1c9ccxlyLixeBU4v9/0fAxf0JZkUFmBikSV0GkgDApkP+z+9So6B4ps1/b2pcHwZ0fOAo=
+SHA256 (Pkgfile) = 9c4ab3e646bd97075dde3db1d0af5cd06439d767c02a550026c641cf4f3e9130
 SHA256 (.footprint) = b33bd4990b747565096fc3e902e1b5937d5e7bdee65aceaaeecb0fc1f58cdf59
-SHA256 (Vulkan-Loader-1.2.174.tar.gz) = c39a660da13450cb5e2d1dc571749d0e9a4f831998b20a7ad9fc7f2c99e1bb0b
-SHA256 (verfix.patch) = 19c25bfcaf063bc1601ee4613328925b1724ca37c158ac96e50149e4b88a1c0a
+SHA256 (Vulkan-Loader-1.2.176.tar.gz) = 9a7cf743bea8bfc7bd8c0527079eea122a95cd2baaf61d1c8589168670e4a152
diff --git a/vulkan-loader/Pkgfile b/vulkan-loader/Pkgfile
index 95e9e34fd..162b5963a 100644
--- a/vulkan-loader/Pkgfile
+++ b/vulkan-loader/Pkgfile
@@ -4,18 +4,14 @@
 # Depends on: vulkan-headers xorg-libxrandr
 
 name=vulkan-loader
-version=1.2.174
-release=3
-source=(https://github.com/KhronosGroup/Vulkan-Loader/archive/v$version/Vulkan-Loader-$version.tar.gz
-	verfix.patch)
+version=1.2.176
+release=1
+source=(https://github.com/KhronosGroup/Vulkan-Loader/archive/v$version/Vulkan-Loader-$version.tar.gz)
 
 build() {
 	prt-get isinst ninja && PKGMK_VULKAN_LOADER+=' -G Ninja'
 	prt-get isinst wayland || PKGMK_VULKAN_LOADER+=' -D BUILD_WSI_WAYLAND_SUPPORT=OFF'
 
-	 # Fix version in .pc file
-	 patch -d Vulkan-Loader-$version -p1 -i $SRC/verfix.patch
-
 	cmake -S Vulkan-Loader-$version -B build $PKGMK_VULKAN_LOADER \
 		-D CMAKE_INSTALL_PREFIX=/usr \
 		-D CMAKE_INSTALL_LIBDIR=lib \
diff --git a/vulkan-loader/verfix.patch b/vulkan-loader/verfix.patch
deleted file mode 100644
index d731e3e47..000000000
--- a/vulkan-loader/verfix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -u -r Vulkan-Loader-1.2.174/cmake/FindVulkanHeaders.cmake Vulkan-Loader-1.2.174-verfix/cmake/FindVulkanHeaders.cmake
---- Vulkan-Loader-1.2.174/cmake/FindVulkanHeaders.cmake	2021-03-29 20:05:47.000000000 +0000
-+++ Vulkan-Loader-1.2.174-verfix/cmake/FindVulkanHeaders.cmake	2021-04-16 14:08:29.582548243 +0000
-@@ -114,19 +114,19 @@
- file(STRINGS
-         ${VulkanHeaders_main_header}
-         VulkanHeaders_lines
--        REGEX "^#define (VK_API_VERSION.*VK_MAKE_VERSION|VK_HEADER_VERSION)")
-+        REGEX "^#define (VK_API_VERSION.*VK_MAKE_API_VERSION|VK_HEADER_VERSION)")
- 
- foreach(VulkanHeaders_line ${VulkanHeaders_lines})
- 
-     # First, handle the case where we have a major/minor version
-     #   Format is:
--    #        #define VK_API_VERSION_X_Y VK_MAKE_VERSION(X, Y, 0)
-+    #        #define VK_API_VERSION_X_Y VK_MAKE_API_VERSION(0, X, Y, 0)
-     #   We grab the major version (X) and minor version (Y) out of the parentheses
--    string(REGEX MATCH "VK_MAKE_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line})
-+    string(REGEX MATCH "VK_MAKE_API_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line})
-     string(REGEX MATCHALL "[0-9]+" VulkanHeaders_MAJOR_MINOR "${VulkanHeaders_out}")
-     if (VulkanHeaders_MAJOR_MINOR)
--        list (GET VulkanHeaders_MAJOR_MINOR 0 VulkanHeaders_cur_major)
--        list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_minor)
-+        list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_major)
-+        list (GET VulkanHeaders_MAJOR_MINOR 2 VulkanHeaders_cur_minor)
-         if (${VulkanHeaders_cur_major} GREATER ${VulkanHeaders_VERSION_MAJOR})
-             set(VulkanHeaders_VERSION_MAJOR ${VulkanHeaders_cur_major})
-             set(VulkanHeaders_VERSION_MINOR ${VulkanHeaders_cur_minor})


More information about the crux-commits mailing list