[crux-commits] ports/compat-32 (3.5): vulkan-validation-layers-32: 1.2.135.0 -> 1.2.141

crux at crux.nu crux at crux.nu
Fri Jul 24 10:07:48 UTC 2020


commit 05dfe71364690752206587452b4169b97f76c3ee
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Fri Jul 24 18:37:50 2020 +1000

    vulkan-validation-layers-32: 1.2.135.0 -> 1.2.141

diff --git a/vulkan-validation-layers-32/.signature b/vulkan-validation-layers-32/.signature
index a70d664..c7fb616 100644
--- a/vulkan-validation-layers-32/.signature
+++ b/vulkan-validation-layers-32/.signature
@@ -1,6 +1,7 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXauBwYMYk/UotchmGgIPj4jWCx3FpSpKw2hyQKtC51m2gzBATrAXLM2PStNdTKz6eVQmZn8j1szCWqpLXESExwE=
-SHA256 (Pkgfile) = 4befdc67df61b908bd758810edb456172d4d2002530596e5801d9cb2c2def5e0
+RWSwxGo/zH7eXfT1vjP8xBeKmCJftEZrb4Z4hEqK8GXhiPinO7t0KmauMyG84DkTWzEdrm8SBtId1gIJQLSucoYyxibNNQ3BzAk=
+SHA256 (Pkgfile) = f41ff3082361019e760cc61b33f26a42c9feac98fbe7fd586b1c275b8e28ace0
 SHA256 (.footprint) = 5c3e1cb61d0d5070cc1d278ec445757e1913b70cdec30985988d48c2f6ded070
-SHA256 (Vulkan-ValidationLayers-sdk-1.2.135.0.tar.gz) = 7a33aa13d9526da4deb945b3ccf5be9cf3c99fb4dfce2caf57640746c1c648d3
+SHA256 (Vulkan-ValidationLayers-v1.2.141.tar.gz) = 3f2ebc5c0d69ead2031893f5c5da9bb4f328a90d30c1665a618a637a48d27ee0
 SHA256 (fix_shared.patch) = 840af33ab26638c8c29da4a7f284eae6aeb40e01d506eef9851d7e6ee4a8bed0
+SHA256 (16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch) = cb8d8bb4526c57460d7f8cdc3c09c4360fdf1f1bce7f3505d52aab0363af1c8a
diff --git a/vulkan-validation-layers-32/16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch b/vulkan-validation-layers-32/16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch
new file mode 100644
index 0000000..e332ef0
--- /dev/null
+++ b/vulkan-validation-layers-32/16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch
@@ -0,0 +1,30 @@
+From 16d17ebf3762f24b3eb06e04843efb7f7dbf8438 Mon Sep 17 00:00:00 2001
+From: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
+Date: Tue, 10 Dec 2019 11:23:23 -0800
+Subject: [PATCH] build: Fix Vulkan registry detection
+
+Fix incomplete VULKAN_REGISTRY_PATH_HINT for the case where
+VULKAN_HEADERS_INSTALL_DIR is not specified.  The hint extracted the
+DIRECTORY of the include dir (e.g. "/usr"), but missed the rest of the
+expected path for finding vk.xml (e.g. "/usr/share/vulkan/registry").
+
+Tested with CMake 3.16.0.
+
+Fixes: 18664450a ("build: Fix Vulkan headers detection with CMake.")
+---
+ cmake/FindVulkanHeaders.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/FindVulkanHeaders.cmake b/cmake/FindVulkanHeaders.cmake
+index 68e261159..1c71ffe10 100644
+--- a/cmake/FindVulkanHeaders.cmake
++++ b/cmake/FindVulkanHeaders.cmake
+@@ -76,7 +76,7 @@ else()
+   # do a normal search without hints.
+   find_path(VulkanHeaders_INCLUDE_DIR NAMES vulkan/vulkan.h)
+   get_filename_component(VULKAN_REGISTRY_PATH_HINT ${VulkanHeaders_INCLUDE_DIR} DIRECTORY)
+-  find_path(VulkanRegistry_DIR NAMES vk.xml HINTS ${VULKAN_REGISTRY_PATH_HINT})
++  find_path(VulkanRegistry_DIR NAMES vk.xml HINTS /usr/share/vulkan/registry)
+ endif()
+ 
+ set(VulkanHeaders_INCLUDE_DIRS ${VulkanHeaders_INCLUDE_DIR})
diff --git a/vulkan-validation-layers-32/Pkgfile b/vulkan-validation-layers-32/Pkgfile
index 68c7442..2619fd4 100644
--- a/vulkan-validation-layers-32/Pkgfile
+++ b/vulkan-validation-layers-32/Pkgfile
@@ -2,17 +2,20 @@
 # URL: https://www.khronos.org/vulkan/
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
 # Depends on: spirv-tools-32 vulkan-loader-32 vulkan-validation-layers
+# Optional: wayland-32
 
 name=vulkan-validation-layers-32
-version=1.2.135.0
+version=1.2.141
 release=1
-source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$version/Vulkan-ValidationLayers-sdk-$version.tar.gz
-	fix_shared.patch)
+source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/v$version/Vulkan-ValidationLayers-v$version.tar.gz
+	fix_shared.patch
+	16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch)
 
 build() {
-	patch -d Vulkan-ValidationLayers-sdk-$version -p1 -i $SRC/fix_shared.patch
+	patch -d Vulkan-ValidationLayers-$version -p1 -i $SRC/fix_shared.patch
+	patch -d Vulkan-ValidationLayers-$version -p1 -i $SRC/16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch
 
-	cmake -SVulkan-ValidationLayers-sdk-$version -Bbuild -GNinja \
+	cmake -SVulkan-ValidationLayers-$version -Bbuild -GNinja \
 		-DCMAKE_INSTALL_PREFIX='/usr' \
 		-DCMAKE_INSTALL_LIBDIR='lib32' \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -23,7 +26,7 @@ build() {
 		-DBUILD_LAYER_SUPPORT_FILES=ON \
 		-DBUILD_WSI_XCB_SUPPORT=ON \
 		-DBUILD_WSI_XLIB_SUPPORT=ON \
-		-DBUILD_WSI_WAYLAND_SUPPORT=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT="$(prt-get isinst wayland-32 &> /dev/null && echo ON || echo OFF)"
 
 	cmake --build build
 	DESTDIR=$PKG cmake --build build --target install


More information about the crux-commits mailing list