commit 2c6beaac2b60ce8bdfcfa833ce6d3f85632be2f0 Author: Danny Rawlins <contact@romster.me> Date: Sun Feb 28 00:26:41 2021 +1100 vulkan-validation-layers: 1.2.154.0 -> 1.2.162.0 diff --git a/vulkan-validation-layers/.footprint b/vulkan-validation-layers/.footprint index 1067963e5..f0b019b4c 100644 --- a/vulkan-validation-layers/.footprint +++ b/vulkan-validation-layers/.footprint @@ -1,36 +1,35 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/vulkan/ --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/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 drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libVkLayer_khronos_validation.so -> libVkLayer_khronos_validation.so.1 -lrwxrwxrwx root/root usr/lib/libVkLayer_khronos_validation.so.1 -> libVkLayer_khronos_validation.so.1.2.154.0 --rwxr-xr-x root/root usr/lib/libVkLayer_khronos_validation.so.1.2.154.0 --rw-r--r-- root/root usr/lib/libVkLayer_utils.a +-rwxr-xr-x root/root usr/lib/libVkLayer_khronos_validation.so +-rwxr-xr-x root/root usr/lib/libVkLayer_utils.so 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 c45ee9d99..1ac47ac3b 100644 --- a/vulkan-validation-layers/.signature +++ b/vulkan-validation-layers/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/XLGF0AxyYxcIhn8pE/oidODQHy1G4V2hl9za4bdmd9+7K4765csaVDwLFhOXl4KWrHJ0V14TI5+c3WQd8Fp0g4= -SHA256 (Pkgfile) = 4ab298630f0f3a91a060145039c8b6f85cbc88c471bc59792f71282fc3c54a18 -SHA256 (.footprint) = f4a25e1503aed06fc0fb6d40e813696ede69afecbcd3e20de97d66629a99b265 -SHA256 (Vulkan-ValidationLayers-sdk-1.2.154.0.tar.gz) = 8898ab05d0d8dec04fbba03d0ed2e79a1eb5c0382e5c89d4c737b45a6648f7f9 -SHA256 (validation-layers-soversion.patch) = 55fa92f03aa5d126db2ab75fb06ea9102019eb68437d9720a8c075a87f3baba8 +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 diff --git a/vulkan-validation-layers/Pkgfile b/vulkan-validation-layers/Pkgfile index e9f09ce42..1c9b5e0fb 100644 --- a/vulkan-validation-layers/Pkgfile +++ b/vulkan-validation-layers/Pkgfile @@ -2,15 +2,16 @@ # URL: https://www.khronos.org/vulkan/ # Maintainer: Danny Rawlins, crux at romster dot me # Depends on: glslang vulkan-loader +# Optional: wayland name=vulkan-validation-layers -version=1.2.154.0 +version=1.2.162.0 release=1 source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$version... - validation-layers-soversion.patch) + fix_shared.patch) build() { - patch -d Vulkan-ValidationLayers-sdk-$version -p1 -i $SRC/validation-layers-soversion.patch + patch -d Vulkan-ValidationLayers-sdk-$version -p1 -i $SRC/fix_shared.patch cmake -SVulkan-ValidationLayers-sdk-$version -Bbuild -GNinja \ -DCMAKE_INSTALL_PREFIX='/usr' \ @@ -20,8 +21,6 @@ build() { -DBUILD_TESTS=OFF \ -DGLSLANG_INSTALL_DIR='/usr' \ -DBUILD_LAYER_SUPPORT_FILES=ON \ - -DVKLAYERS_SOVERSION='1' \ - -DVKLAYERS_VERSION="$version" \ -DSPIRV_HEADERS_INSTALL_DIR='/usr/include/spirv/' \ -DCMAKE_INSTALL_INCLUDEDIR='/usr/include/vulkan/' \ -DBUILD_WSI_XCB_SUPPORT=ON \ diff --git a/vulkan-validation-layers/fix_shared.patch b/vulkan-validation-layers/fix_shared.patch new file mode 100644 index 000000000..8082da82d --- /dev/null +++ b/vulkan-validation-layers/fix_shared.patch @@ -0,0 +1,12 @@ +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/validation-layers-soversion.patch b/vulkan-validation-layers/validation-layers-soversion.patch deleted file mode 100644 index 213cfcb76..000000000 --- a/vulkan-validation-layers/validation-layers-soversion.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: Vulkan-ValidationLayers-sdk-1.1.121.0/CMakeLists.txt -=================================================================== ---- Vulkan-ValidationLayers-sdk-1.1.121.0/CMakeLists.txt -+++ Vulkan-ValidationLayers-sdk-1.1.121.0/CMakeLists.txt 2019-09-25 12:25:23.778410890 +0200 -@@ -27,6 +27,9 @@ - - enable_testing() - -+set(VKLAYERS_VERSION "1.0.0" CACHE STRING "Build version") -+set(VKLAYERS_SOVERSION "1" CACHE STRING "Library API version") -+ - # User-interface declarations ---------------------------------------------------------------------------------------------------- - # This section contains variables that affect development GUIs (e.g. CMake GUI and IDEs), such as option(), folders, and variables - # with the CACHE property. -Index: Vulkan-ValidationLayers-sdk-1.1.121.0/layers/CMakeLists.txt -=================================================================== ---- Vulkan-ValidationLayers-sdk-1.1.121.0/layers/CMakeLists.txt -+++ Vulkan-ValidationLayers-sdk-1.1.121.0/layers/CMakeLists.txt 2019-09-25 12:25:23.779410888 +0200 -@@ -133,6 +133,9 @@ - else(UNIX AND NOT APPLE) # i.e.: Linux - macro(AddVkLayer target LAYER_COMPILE_DEFINITIONS) - add_library(VkLayer_${target} SHARED ${ARGN}) -+ set_target_properties(VkLayer_${target} PROPERTIES -+ VERSION ${VKLAYERS_VERSION} -+ SOVERSION ${VKLAYERS_SOVERSION}) - target_compile_definitions(VkLayer_${target} PUBLIC ${LAYER_COMPILE_DEFINITIONS}) - target_link_libraries(VkLayer_${target} PRIVATE VkLayer_utils) - add_dependencies(VkLayer_${target} VkLayer_utils)