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

crux at crux.nu crux at crux.nu
Thu Apr 22 12:05:17 UTC 2021


commit 86556fc8c42d0379e1866c2141954713c1c8fbde
Author: Danny Rawlins <contact at romster.me>
Date:   Thu Apr 22 20:55:39 2021 +1000

    vulkan-loader-32: 1.2.174 -> 1.2.176

diff --git a/vulkan-loader-32/.signature b/vulkan-loader-32/.signature
index a227e19..495a7c8 100644
--- a/vulkan-loader-32/.signature
+++ b/vulkan-loader-32/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXUehSFvXvRuE1hcwtI66HkcdGFNWoheaPpx2NTOnHOr1a0gMjdbO7D6l9i2Uuhoja0pjFRW6Oeyn6y6PJcNxhAw=
-SHA256 (Pkgfile) = d444f7afb3c6a9eafd4661ca793ff47766a309fc37c6c9cfe5b494d3de191c45
+RWSwxGo/zH7eXaza035V1jnyU3OuvUypgXIUdIu6uCLC/0kg1+xrY8QEsf890xbEetNvbf9MQlhH87zh1AMKjkznO8dYqQKC+QQ=
+SHA256 (Pkgfile) = 57dc49e644ecc7ad82c2cd4bc046e82df6969f3b4fd1247c60f2fc36d37250b2
 SHA256 (.footprint) = b8c4a504f782b21dad343e5e9dc1e4725fa0e2e6eea92be1f7a98c866d385e11
-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-32/Pkgfile b/vulkan-loader-32/Pkgfile
index 6269e38..ca8f67f 100644
--- a/vulkan-loader-32/Pkgfile
+++ b/vulkan-loader-32/Pkgfile
@@ -5,10 +5,9 @@
 # Optional: wayland-32
 
 name=vulkan-loader-32
-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'
@@ -16,9 +15,6 @@ build() {
 
 	export ASFLAGS='--32'
 
-	# 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=lib32 \
diff --git a/vulkan-loader-32/verfix.patch b/vulkan-loader-32/verfix.patch
deleted file mode 100644
index d731e3e..0000000
--- a/vulkan-loader-32/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