[crux-commits] ports/opt (3.6): [notify] vulkan-validation-layers: 1.2.162.0 -> 1.2.174 New dependencies: spirv-tools vulkan-headers xorg-libxcb xorg-libx11 xorg-libxrandr

crux at crux.nu crux at crux.nu
Mon Apr 5 05:35:26 UTC 2021


commit 68f8930bcb989e4d7d6df5aa9149eba3d4869064
Author: Danny Rawlins <contact at romster.me>
Date:   Mon Apr 5 15:35:18 2021 +1000

    [notify] vulkan-validation-layers: 1.2.162.0 -> 1.2.174 New dependencies: spirv-tools vulkan-headers xorg-libxcb xorg-libx11 xorg-libxrandr

diff --git a/vulkan-validation-layers/.footprint b/vulkan-validation-layers/.footprint
index f0b019b4c..b4b342446 100644
--- a/vulkan-validation-layers/.footprint
+++ b/vulkan-validation-layers/.footprint
@@ -1,35 +1,34 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/vulkan/
-drwxr-xr-x	root/root	usr/include/vulkan/vulkan/
--rw-r--r--	root/root	usr/include/vulkan/vulkan/cast_utils.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/hash_util.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/hash_vk_types.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_dispatch_table_helper.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_enum_string_helper.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_extension_helper.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_format_utils.cpp
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_format_utils.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_layer_config.cpp
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_layer_config.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_layer_data.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_layer_dispatch_table.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_layer_extension_utils.cpp
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_layer_extension_utils.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_layer_logging.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_layer_utils.cpp
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_layer_utils.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_loader_platform.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_object_types.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_safe_struct.cpp
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_safe_struct.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_typemap_helper.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/vk_validation_error_messages.h
--rw-r--r--	root/root	usr/include/vulkan/vulkan/xxhash.c
--rw-r--r--	root/root	usr/include/vulkan/vulkan/xxhash.h
+-rw-r--r--	root/root	usr/include/vulkan/cast_utils.h
+-rw-r--r--	root/root	usr/include/vulkan/hash_util.h
+-rw-r--r--	root/root	usr/include/vulkan/hash_vk_types.h
+-rw-r--r--	root/root	usr/include/vulkan/vk_dispatch_table_helper.h
+-rw-r--r--	root/root	usr/include/vulkan/vk_enum_string_helper.h
+-rw-r--r--	root/root	usr/include/vulkan/vk_extension_helper.h
+-rw-r--r--	root/root	usr/include/vulkan/vk_format_utils.cpp
+-rw-r--r--	root/root	usr/include/vulkan/vk_format_utils.h
+-rw-r--r--	root/root	usr/include/vulkan/vk_layer_config.cpp
+-rw-r--r--	root/root	usr/include/vulkan/vk_layer_config.h
+-rw-r--r--	root/root	usr/include/vulkan/vk_layer_data.h
+-rw-r--r--	root/root	usr/include/vulkan/vk_layer_dispatch_table.h
+-rw-r--r--	root/root	usr/include/vulkan/vk_layer_extension_utils.cpp
+-rw-r--r--	root/root	usr/include/vulkan/vk_layer_extension_utils.h
+-rw-r--r--	root/root	usr/include/vulkan/vk_layer_logging.h
+-rw-r--r--	root/root	usr/include/vulkan/vk_layer_utils.cpp
+-rw-r--r--	root/root	usr/include/vulkan/vk_layer_utils.h
+-rw-r--r--	root/root	usr/include/vulkan/vk_loader_platform.h
+-rw-r--r--	root/root	usr/include/vulkan/vk_object_types.h
+-rw-r--r--	root/root	usr/include/vulkan/vk_safe_struct.cpp
+-rw-r--r--	root/root	usr/include/vulkan/vk_safe_struct.h
+-rw-r--r--	root/root	usr/include/vulkan/vk_typemap_helper.h
+-rw-r--r--	root/root	usr/include/vulkan/vk_validation_error_messages.h
+-rw-r--r--	root/root	usr/include/vulkan/xxhash.c
+-rw-r--r--	root/root	usr/include/vulkan/xxhash.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libVkLayer_khronos_validation.so
--rwxr-xr-x	root/root	usr/lib/libVkLayer_utils.so
+-rw-r--r--	root/root	usr/lib/libVkLayer_utils.a
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/vulkan/
 drwxr-xr-x	root/root	usr/share/vulkan/explicit_layer.d/
diff --git a/vulkan-validation-layers/.signature b/vulkan-validation-layers/.signature
index 1ac47ac3b..1fe419c20 100644
--- a/vulkan-validation-layers/.signature
+++ b/vulkan-validation-layers/.signature
@@ -1,6 +1,8 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/e78rAiKzQUYdro/nrWMKP/vpAGv4zuyfFX+qnqLpDlo1ppP0dBkzl44LZXHxkjsdKGs4TCBbN6XU1gsNRwSzgE=
-SHA256 (Pkgfile) = 24cfba8965e08d0059b5299493eb6f7cc54526601da410fe2befe019462577fb
-SHA256 (.footprint) = c9e556dbcb34ac51e23515472b1b4eaa1cd86eb5dcea3f1236a2664ed021059c
-SHA256 (Vulkan-ValidationLayers-sdk-1.2.162.0.tar.gz) = 80aa9e180b3900598121d7a3ea613665b99aae21bb40268ecafd82df8016c6f5
-SHA256 (fix_shared.patch) = 840af33ab26638c8c29da4a7f284eae6aeb40e01d506eef9851d7e6ee4a8bed0
+RWSE3ohX2g5d/alC5HqcE7s++tSHwABQunQD8WwkbKJaPAD8LECkAN8j/SlRJ/QHgL7vA2WCRD9hQyLWJp0+7pP7OBECUjPVnQQ=
+SHA256 (Pkgfile) = 40c340c93b3e4cd4b6f764cafc237c97c51f4ee6b99238cd55e7ff31e02fb46d
+SHA256 (.footprint) = 66e56224031ef22f7a9d7a66474b1c11317ff7ff78775daa1763b3e360e91e01
+SHA256 (Vulkan-ValidationLayers-1.2.174.tar.gz) = 5696a502a11ca0fb954b1dbf6b887ce6371c6a80666420102d5b6250117e06f7
+SHA256 (SPIRV-Headers-75b30a659c8a4979104986652c54cc421fc51129.tar.gz) = 60a5845bcd0ee30e000151bb725b461f67f95d703294ef74c034ff3a3e039324
+SHA256 (robin-hood-hashing-3.11.1.tar.gz) = 31143d316b49e29b57773e720ec9ac3f7a8223dc7710329b566c874c69e1d087
+SHA256 (known_good.py.in) = f5e5330201ab5686a84d9ff65fd372af510d564aa6eb2d3c332d59a6e69ce2e3
diff --git a/vulkan-validation-layers/Pkgfile b/vulkan-validation-layers/Pkgfile
index 1c9b5e0fb..cf6b2c1e7 100644
--- a/vulkan-validation-layers/Pkgfile
+++ b/vulkan-validation-layers/Pkgfile
@@ -1,31 +1,42 @@
 # Description: Vulkan validation layers
 # URL: https://www.khronos.org/vulkan/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: glslang vulkan-loader
+# Depends on: cmake glslang spirv-tools vulkan-headers xorg-libxcb xorg-libx11 xorg-libxrandr
 # Optional: wayland
 
 name=vulkan-validation-layers
-version=1.2.162.0
+version=1.2.174
+_spirv_headers=75b30a659c8a4979104986652c54cc421fc51129
+_robin_hood=3.11.1
 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-$version.tar.gz
+	https://github.com/KhronosGroup/SPIRV-Headers/archive/$_spirv_headers/SPIRV-Headers-$_spirv_headers.tar.gz
+	https://github.com/martinus/robin-hood-hashing/archive/$_robin_hood/robin-hood-hashing-$_robin_hood.tar.gz
+	known_good.py.in)
 
 build() {
-	patch -d Vulkan-ValidationLayers-sdk-$version -p1 -i $SRC/fix_shared.patch
+	mkdir -p Vulkan-ValidationLayers-$version/headers/external/spirv-headers \
+		Vulkan-ValidationLayers-$version/robin_hood/external/robin-hood-hashing
+	cp -r SPIRV-Headers-$_spirv_headers/* Vulkan-ValidationLayers-$version/headers/external/spirv-headers
+	cp -r robin-hood-hashing-$_robin_hood/* Vulkan-ValidationLayers-$version/robin_hood/external/robin-hood-hashing
 
-	cmake -SVulkan-ValidationLayers-sdk-$version -Bbuild -GNinja \
-		-DCMAKE_INSTALL_PREFIX='/usr' \
-		-DCMAKE_INSTALL_LIBDIR='lib' \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DBUILD_TESTS=OFF \
-		-DGLSLANG_INSTALL_DIR='/usr' \
-		-DBUILD_LAYER_SUPPORT_FILES=ON \
-		-DSPIRV_HEADERS_INSTALL_DIR='/usr/include/spirv/' \
-		-DCMAKE_INSTALL_INCLUDEDIR='/usr/include/vulkan/' \
-		-DBUILD_WSI_XCB_SUPPORT=ON \
-		-DBUILD_WSI_XLIB_SUPPORT=ON \
-		-DBUILD_WSI_WAYLAND_SUPPORT="$(prt-get isinst wayland &> /dev/null && echo ON || echo OFF)" \
+	sed -e "s|@SRC@|$SRC/Vulkan-ValidationLayers-$version|" $SRC/known_good.py.in > $SRC/known_good.py
+	chmod u+x $SRC/known_good.py
+	$SRC/known_good.py
+
+	prt-get isinst ninja && PKGMK_VULKAN_VALIDATION_LAYERS+=' -G Ninja'
+	prt-get isinst wayland || PKGMK_VULKAN_VALIDATION_LAYERS+=' -D BUILD_WSI_WAYLAND_SUPPORT=OFF'
+
+	cmake -S Vulkan-ValidationLayers-$version -B build $PKGMK_VULKAN_VALIDATION_LAYERS \
+		-D CMAKE_INSTALL_PREFIX=/usr \
+		-D CMAKE_INSTALL_LIBDIR=lib \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}" \
+		-D BUILD_TESTS=OFF \
+		-D BUILD_LAYER_SUPPORT_FILES=ON \
+		-D GLSLANG_INSTALL_DIR:PATH='/usr/include/glslang' \
+		-D ROBIN_HOOD_HASHING_INSTALL_DIR:PATH="$SRC/Vulkan-ValidationLayers-$version/robin_hood/external/robin-hood-hashing" \
+		-D SPIRV_HEADERS_INSTALL_DIR:PATH="$SRC/Vulkan-ValidationLayers-$version/headers/external/spirv-headers" \
 		-Wno-dev
 
 	cmake --build build
diff --git a/vulkan-validation-layers/fix_shared.patch b/vulkan-validation-layers/fix_shared.patch
deleted file mode 100644
index 8082da82d..000000000
--- a/vulkan-validation-layers/fix_shared.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt.dma Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt
---- Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt.dma	2019-02-13 09:20:44.590959278 +1000
-+++ Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt	2019-02-13 09:21:29.178151673 +1000
-@@ -294,7 +294,7 @@ set_target_properties(generate_helper_fi
- # files directly in layers.
- 
- add_library(VkLayer_utils
--            STATIC
-+            SHARED
-             layers/vk_layer_config.cpp
-             layers/vk_layer_extension_utils.cpp
-             layers/vk_layer_utils.cpp
diff --git a/vulkan-validation-layers/known_good.py.in b/vulkan-validation-layers/known_good.py.in
new file mode 100755
index 000000000..fc9ea78d0
--- /dev/null
+++ b/vulkan-validation-layers/known_good.py.in
@@ -0,0 +1,12 @@
+#!/usr/bin/python3
+
+import json
+
+with open('@SRC@/scripts/known_good.json', 'r') as myfile:
+    data=myfile.read()
+
+obj = json.loads(data)
+
+print (str(obj['repos'][0]['name']) + ': ' + str(obj['repos'][0]['commit']))
+print (str(obj['repos'][1]['name']) + ': ' + str(obj['repos'][1]['commit']))
+print (str(obj['repos'][2]['name']) + ': ' + str(obj['repos'][2]['commit']))


More information about the crux-commits mailing list