From 25ae94b0b5a0752fdf97a8bb9e54e6df12222386 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sat, 24 Oct 2020 01:58:16 +1100 Subject: [PATCH] vulkan-validation-layers: 1.2.141 -> 1.2.154.0 --- vulkan-validation-layers/.footprint | 6 ++-- vulkan-validation-layers/.signature | 11 ++++--- ...7ebf3762f24b3eb06e04843efb7f7dbf8438.patch | 30 ------------------- vulkan-validation-layers/Pkgfile | 17 ++++++----- vulkan-validation-layers/fix_shared.patch | 12 -------- .../validation-layers-soversion.patch | 28 +++++++++++++++++ 6 files changed, 46 insertions(+), 58 deletions(-) delete mode 100644 vulkan-validation-layers/16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch delete mode 100644 vulkan-validation-layers/fix_shared.patch create mode 100644 vulkan-validation-layers/validation-layers-soversion.patch diff --git a/vulkan-validation-layers/.footprint b/vulkan-validation-layers/.footprint index 2c61499d1..1067963e5 100644 --- a/vulkan-validation-layers/.footprint +++ b/vulkan-validation-layers/.footprint @@ -27,8 +27,10 @@ drwxr-xr-x root/root usr/include/vulkan/ -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 +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 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 21f2287c0..c45ee9d99 100644 --- a/vulkan-validation-layers/.signature +++ b/vulkan-validation-layers/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ZlIqDQS6fSeX0oW9N4euIMOoktI1Ho5OMUa4p7E5bHndAQCNwUv1xw0UIYf9E3mbnWc80VJSPUnxb07dHKwrAQ= -SHA256 (Pkgfile) = cf8a58f5bb2735a87d475a29dfc6feb7b0556f1fb4cd56c79a5e653e0be63999 -SHA256 (.footprint) = cd0824869148d109d026a99a0393dd24215cedf6341979627c5b49957a634e5f -SHA256 (Vulkan-ValidationLayers-v1.2.141.tar.gz) = 3f2ebc5c0d69ead2031893f5c5da9bb4f328a90d30c1665a618a637a48d27ee0 -SHA256 (fix_shared.patch) = 840af33ab26638c8c29da4a7f284eae6aeb40e01d506eef9851d7e6ee4a8bed0 -SHA256 (16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch) = cb8d8bb4526c57460d7f8cdc3c09c4360fdf1f1bce7f3505d52aab0363af1c8a +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 diff --git a/vulkan-validation-layers/16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch b/vulkan-validation-layers/16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch deleted file mode 100644 index e332ef0f7..000000000 --- a/vulkan-validation-layers/16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 16d17ebf3762f24b3eb06e04843efb7f7dbf8438 Mon Sep 17 00:00:00 2001 -From: Caio Marcelo de Oliveira Filho -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/Pkgfile b/vulkan-validation-layers/Pkgfile index fb1a57d53..e9f09ce42 100644 --- a/vulkan-validation-layers/Pkgfile +++ b/vulkan-validation-layers/Pkgfile @@ -4,25 +4,26 @@ # Depends on: glslang vulkan-loader name=vulkan-validation-layers -version=1.2.141 +version=1.2.154.0 release=1 -source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/v$version/Vulkan-ValidationLayers-v$version.tar.gz - fix_shared.patch - 16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch) +source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$version/Vulkan-ValidationLayers-sdk-$version.tar.gz + validation-layers-soversion.patch) build() { - patch -d Vulkan-ValidationLayers-$version -p1 -i $SRC/fix_shared.patch - patch -d Vulkan-ValidationLayers-$version -p1 -i $SRC/16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch + patch -d Vulkan-ValidationLayers-sdk-$version -p1 -i $SRC/validation-layers-soversion.patch - cmake -SVulkan-ValidationLayers-$version -Bbuild -GNinja \ + 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' \ - -DCMAKE_INSTALL_INCLUDEDIR='/usr/include/vulkan/' \ -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 \ -DBUILD_WSI_XLIB_SUPPORT=ON \ -DBUILD_WSI_WAYLAND_SUPPORT="$(prt-get isinst wayland &> /dev/null && echo ON || echo OFF)" \ 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/validation-layers-soversion.patch b/vulkan-validation-layers/validation-layers-soversion.patch new file mode 100644 index 000000000..213cfcb76 --- /dev/null +++ b/vulkan-validation-layers/validation-layers-soversion.patch @@ -0,0 +1,28 @@ +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)