commit ae0859303c2759a34eddf3f9525aa71f1852df48 Author: Danny Rawlins <contact@romster.me> Date: Sun Feb 20 22:21:58 2022 +1100 [notify] vulkan-validation-layers: 1.2.198.0 -> 1.3.204.0 new dependency: robin-hood-hashing diff --git a/vulkan-validation-layers/.signature b/vulkan-validation-layers/.signature index bb5cf1084..cd4b25fe4 100644 --- a/vulkan-validation-layers/.signature +++ b/vulkan-validation-layers/.signature @@ -1,10 +1,10 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/RT3z5C1mwgkx3oCkkrsiG71IvsjgHp/G/A9KqaXTMyZz4uonnyV4fichl6GygaNi48X01kTyQZbnALhwKsY2QU= -SHA256 (Pkgfile) = 19a56db31a3a3e1aad8d527b1f29b7db5a5f20d092362806ff86ab12cc5f9a7a +RWSE3ohX2g5d/ddp0Mk6lnB83rimmC/5PqLKcw6mXeC9/g8ZmGCuBlRkZmleRojgpuHFNKjKktlQEq/P4hfveNQZRXvthM5xjAY= +SHA256 (Pkgfile) = 12014068c3233e343d24b372b3380d47028ab1ee3fa886be10c1899d7efd7690 SHA256 (.footprint) = cd0824869148d109d026a99a0393dd24215cedf6341979627c5b49957a634e5f -SHA256 (Vulkan-ValidationLayers-1.2.198.0.tar.gz) = 4a70cc5da26baf873fcf69b081eeeda545515dd66e5904f18fee32b4d275593a -SHA256 (SPIRV-Headers-814e728b30ddd0f4509233099a3ad96fd4318c07.tar.gz) = c262d3c0c36ad5c87fbe3572aa292d2aed4dcd9b1ca4868eff9ec180e3f994f2 -SHA256 (robin-hood-hashing-3.11.3.tar.gz) = dcf2b7fa9ef9dd0c67102d94c28e8df3effbe1845e0ed1f31f4772ca5e857fc4 +SHA256 (Vulkan-ValidationLayers-1.3.204.0.tar.gz) = 82b59c4622e9d1dbe267c4651bb2514b6b89bee90e512ae7d1d7abc76c833a1d +SHA256 (SPIRV-Headers-b42ba6d92faf6b4938e6f22ddd186dbdacc98d78.tar.gz) = d58e8e65ea4b4f1e421caaad68f88ce7b713ac3519bd49e7b71b6a5690489eb6 SHA256 (known_good.py.in) = f5e5330201ab5686a84d9ff65fd372af510d564aa6eb2d3c332d59a6e69ce2e3 SHA256 (add-missing-export.patch) = 6ce7222099403dea8425b1dd305b9ebc43e747c32aca2a24cfc7f67ddd34cebf SHA256 (fix_shared.patch) = 840af33ab26638c8c29da4a7f284eae6aeb40e01d506eef9851d7e6ee4a8bed0 +SHA256 (vulkan-layers-1.3.204-Fix-dependency-detection.patch) = 9aff42a5d6fc5073fbcb6c0dde45b4eba49083317a4bee0cd6db011c92b4744c diff --git a/vulkan-validation-layers/Pkgfile b/vulkan-validation-layers/Pkgfile index 2d036e88b..3fd96e1a6 100644 --- a/vulkan-validation-layers/Pkgfile +++ b/vulkan-validation-layers/Pkgfile @@ -1,33 +1,30 @@ # Description: Vulkan validation layers # URL: https://www.khronos.org/vulkan/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: cmake glslang spirv-tools vulkan-headers xorg-libxcb xorg-libx11 xorg-libxrandr +# Depends on: glslang robin-hood-hashing spirv-tools vulkan-headers xorg-libxrandr # Optional: wayland name=vulkan-validation-layers -version=1.2.198.0 -_spirv_headers=814e728b30ddd0f4509233099a3ad96fd4318c07 -_robin_hood=3.11.3 -release=2 +version=1.3.204.0 +_spirv_headers=b42ba6d92faf6b4938e6f22ddd186dbdacc98d78 +release=1 source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$version... https://github.com/KhronosGroup/SPIRV-Headers/archive/$_spirv_headers/SPIRV-... - https://github.com/martinus/robin-hood-hashing/archive/$_robin_hood/robin-ho... known_good.py.in add-missing-export.patch - fix_shared.patch) + fix_shared.patch + vulkan-layers-1.3.204-Fix-dependency-detection.patch) build() { ( cd Vulkan-ValidationLayers-sdk-$version - mkdir -p \ - headers/external/spirv-headers \ - robin_hood/external/robin-hood-hashing + mkdir -p headers/external/spirv-headers cp -r $SRC/SPIRV-Headers-$_spirv_headers/* headers/external/spirv-headers - cp -r $SRC/robin-hood-hashing-$_robin_hood/* robin_hood/external/robin-hood-hashing patch -p1 -i $SRC/add-missing-export.patch patch -p1 -i $SRC/fix_shared.patch + patch -p1 -i $SRC/vulkan-layers-1.3.204-Fix-dependency-detection.patch ) sed -e "s|@SRC@|$SRC/Vulkan-ValidationLayers-sdk-$version|" $SRC/known_good.py.in > $SRC/known_good.py @@ -44,8 +41,7 @@ build() { -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-sdk-$version/robin_hood/external/robin-hood-hashing" \ + -D USE_ROBIN_HOOD_HASHING=ON \ -D SPIRV_HEADERS_INSTALL_DIR:PATH="$SRC/Vulkan-ValidationLayers-sdk-$version/headers/external/spirv-headers" \ -Wno-dev diff --git a/vulkan-validation-layers/vulkan-layers-1.3.204-Fix-dependency-detection.patch b/vulkan-validation-layers/vulkan-layers-1.3.204-Fix-dependency-detection.patch new file mode 100644 index 000000000..25f3b4baf --- /dev/null +++ b/vulkan-validation-layers/vulkan-layers-1.3.204-Fix-dependency-detection.patch @@ -0,0 +1,90 @@ +From 534810e26e0be782b2c702a97bf726af250b8cd6 Mon Sep 17 00:00:00 2001 +From: Jeremy Gebben <jeremyg@lunarg.com> +Date: Thu, 17 Feb 2022 15:26:25 -0700 +Subject: [PATCH] build: Handle many permutations of SPIRV-Headers locations + +If the SPIRV-Headers package is not found, fall back to looking for +headers in SPIRV_HEADERS_INSTALL_DIR or SPIRV_HEADERS_INCLUDE_DIR. + +Fixes #3765 +--- + CMakeLists.txt | 19 ++++++++++++++++--- + layers/CMakeLists.txt | 7 +------ + tests/CMakeLists.txt | 6 +++--- + 3 files changed, 20 insertions(+), 12 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d4ca786ca07..58a966f03d6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -256,10 +256,23 @@ if (USE_ROBIN_HOOD_HASHING) + endif() + endif() + +-set(SPIRV_HEADERS_INCLUDE_DIR "" CACHE STRING "") + if(BUILD_LAYERS OR BUILD_TESTS) +- if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "") +- find_package(SPIRV-Headers REQUIRED CONFIG) ++ find_package(SPIRV-Headers CONFIG QUIET) ++ if(SPIRV-Headers_FOUND) ++ # pefer the package if found. Note that if SPIRV_HEADERS_INSTALL_DIR points at an 'installed' ++ # version of SPIRV-Headers, the package will be found. ++ get_target_property(SPIRV_HEADERS_INCLUDE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES) ++ elseif(SPIRV_HEADERS_INCLUDE_DIR) ++ # This is set by SPIRV-Tools (in parent scope!) and also some packages that include VVL with add_subdirectory ++ if (NOT EXISTS "${SPIRV_HEADERS_INCLUDE_DIR}/spirv/unified1/spirv.h") ++ message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INCLUDE_DIR: ${SPIRV_HEADERS_INCLUDE_DIR}") ++ endif() ++ elseif(SPIRV_HEADERS_INSTALL_DIR) ++ # This is our official variable for setting SPIRV-Headers location, but pointing at the raw source of SPIRV-Headers ++ if (NOT EXISTS "${SPIRV_HEADERS_INSTALL_DIR}/include/spirv/unified1/spirv.h") ++ message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INSTALL_DIR: ${SPIRV_HEADERS_INSTALL_DIR}") ++ endif() ++ set(SPIRV_HEADERS_INCLUDE_DIR "${SPIRV_HEADERS_INSTALL_DIR}/include") + endif() + endif() + +diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt +index 6edcf6eb5ab..59e294a0793 100644 +--- a/layers/CMakeLists.txt ++++ b/layers/CMakeLists.txt +@@ -309,12 +309,7 @@ if(BUILD_LAYERS) + if (USE_ROBIN_HOOD_HASHING) + target_include_directories(VkLayer_khronos_validation PRIVATE ${ROBIN_HOOD_HASHING_INCLUDE_DIR}) + endif() +- if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "") +- target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Headers::SPIRV-Headers) +- else() +- target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR}) +- endif() +- ++ target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR}) + target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt) + + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 2b98d109b7f..780c0538486 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,6 +1,6 @@ + # ~~~ +-# Copyright (c) 2014-2021 Valve Corporation +-# Copyright (c) 2014-2021 LunarG, Inc. ++# Copyright (c) 2014-2022 Valve Corporation ++# Copyright (c) 2014-2022 LunarG, Inc. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. +@@ -149,11 +149,11 @@ if (NOT MSVC) + target_compile_options(vk_layer_validation_tests PRIVATE "-Wno-sign-compare") + endif() + ++target_include_directories(vk_layer_validation_tests PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR}) + # Specify target_link_libraries + target_link_libraries(vk_layer_validation_tests + PRIVATE VkLayer_utils + ${GLSLANG_LIBRARIES} +- SPIRV-Headers::SPIRV-Headers + SPIRV-Tools-static SPIRV-Tools-opt + GTest::gtest GTest::gtest_main) +