commit 653c91efd9c29642ffd8486d350d1f79239ec4e6 Author: Tim Biermann <tbier@posteo.de> Date: Mon Oct 31 10:30:42 2022 +0000 vulkan-validation-layers: 1.3.216.0 -> 1.3.231.1 diff --git a/vulkan-validation-layers/.footprint b/vulkan-validation-layers/.footprint index 2c61499d1..87d4dd436 100644 --- a/vulkan-validation-layers/.footprint +++ b/vulkan-validation-layers/.footprint @@ -18,7 +18,6 @@ drwxr-xr-x root/root usr/include/vulkan/ -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 diff --git a/vulkan-validation-layers/.signature b/vulkan-validation-layers/.signature index 40ee2b440..ff7074d4d 100644 --- a/vulkan-validation-layers/.signature +++ b/vulkan-validation-layers/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Q0x/xVc8lxAd6Q8AW5flycsFvqnY4q3LBeg9SdG+pDBsobFcDT3Pv6JCMbVKNmWZ1jVVv842/vWeu8gvBujewo= -SHA256 (Pkgfile) = e7c3080256aacb8d26afa836bff4e9f618257e6ea7cb9df23ac3827a9c157ab6 -SHA256 (.footprint) = cd0824869148d109d026a99a0393dd24215cedf6341979627c5b49957a634e5f -SHA256 (Vulkan-ValidationLayers-sdk-1.3.216.0.tar.gz) = 593d9b818d536490b70322a01b306ec165df5e7a70d770d05014fbd0b325fa15 -SHA256 (add-missing-export.patch) = 6ce7222099403dea8425b1dd305b9ebc43e747c32aca2a24cfc7f67ddd34cebf +RWSE3ohX2g5d/UQ+vQBNI2+xNCGK8G7b1po6SMfybXzi/71dwJ1vcerxKuqOfgD0RZAWfio6ymwEOl4waD49gd6b5JBQCEMA2QA= +SHA256 (Pkgfile) = 67041320169425a32a300a6d0183b3bbbb9dcbbf60e9647e2dae08b1e4e6e96d +SHA256 (.footprint) = 51ebca3b8fe18fac97ff3a25aaecc184ed19ee027c33ebd6e53ff70025aeb22a +SHA256 (Vulkan-ValidationLayers-sdk-1.3.231.1.tar.gz) = ea40af0f499e7e97a86ee54410c5c78e7f7bac40f65ae09a1549773b6501bf4d SHA256 (fix_shared.patch) = 840af33ab26638c8c29da4a7f284eae6aeb40e01d506eef9851d7e6ee4a8bed0 diff --git a/vulkan-validation-layers/Pkgfile b/vulkan-validation-layers/Pkgfile index 7f8579737..af090e633 100644 --- a/vulkan-validation-layers/Pkgfile +++ b/vulkan-validation-layers/Pkgfile @@ -6,28 +6,24 @@ name=vulkan-validation-layers _name=Vulkan-ValidationLayers-sdk -version=1.3.216.0 +version=1.3.231.1 _version=sdk-$version -#version=1.3.213 -#_version=v$version -#_name=Vulkan-ValidationLayers release=1 source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/$_version/$_... - add-missing-export.patch fix_shared.patch) build() { - patch -d $_name-$version -p1 -i $SRC/add-missing-export.patch patch -d $_name-$version -p1 -i $SRC/fix_shared.patch - 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 $_name-$version -B build $PKGMK_VULKAN_VALIDATION_LAYERS \ + cmake -S $_name-$version -B build -G Ninja $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} -ffat-lto-objects" \ + -D SPIRV_HEADERS_INSTALL_DIR=/usr \ + -D VULKAN_HEADERS_INSTALL_DIR=/usr \ -D BUILD_TESTS=OFF \ -D BUILD_LAYER_SUPPORT_FILES=ON \ -D USE_ROBIN_HOOD_HASHING=ON \ diff --git a/vulkan-validation-layers/add-missing-export.patch b/vulkan-validation-layers/add-missing-export.patch deleted file mode 100644 index 7137cd4f8..000000000 --- a/vulkan-validation-layers/add-missing-export.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.cpp.dma Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.cpp ---- Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.cpp.dma 2021-08-07 08:13:46.344320103 +1000 -+++ Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.cpp 2021-08-07 08:14:22.130893289 +1000 -@@ -68,7 +68,7 @@ class ConfigFile { - - static ConfigFile layer_config; - --string GetEnvironment(const char *variable) { -+VK_LAYER_EXPORT string GetEnvironment(const char *variable) { - #if !defined(__ANDROID__) && !defined(_WIN32) - const char *output = getenv(variable); - return output == NULL ? "" : output; -diff -up Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.h.dma Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.h ---- Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.h.dma 2021-08-07 08:14:04.352608540 +1000 -+++ Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.h 2021-08-07 08:14:15.237782885 +1000 -@@ -33,7 +33,7 @@ - #define SECONDARY_VK_REGISTRY_HIVE_STR "HKEY_CURRENT_USER" - #endif - --std::string GetEnvironment(const char *variable); -+VK_LAYER_EXPORT std::string GetEnvironment(const char *variable); - - #ifdef __cplusplus - extern "C" {