From 876961d1e2b9b8b5c50fcc4832331a377dbff0ff Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sun, 11 Apr 2021 01:54:39 +1000 Subject: [PATCH] vulkan-validation-layers-32: 1.2.162.0 -> 1.2.174 --- vulkan-validation-layers-32/.footprint | 2 +- vulkan-validation-layers-32/.signature | 11 ++++--- vulkan-validation-layers-32/Pkgfile | 42 +++++++++++++++----------- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/vulkan-validation-layers-32/.footprint b/vulkan-validation-layers-32/.footprint index df1b7ba5..4ccacb50 100644 --- a/vulkan-validation-layers-32/.footprint +++ b/vulkan-validation-layers-32/.footprint @@ -1,4 +1,4 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rwxr-xr-x root/root usr/lib32/libVkLayer_khronos_validation.so --rwxr-xr-x root/root usr/lib32/libVkLayer_utils.so +-rw-r--r-- root/root usr/lib32/libVkLayer_utils.a diff --git a/vulkan-validation-layers-32/.signature b/vulkan-validation-layers-32/.signature index 0df0356e..b5f0e641 100644 --- a/vulkan-validation-layers-32/.signature +++ b/vulkan-validation-layers-32/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXbHtaNZPOFkcr4hewBxoEUgAMLdSECc2iV9fWQg7/ghLRNuL0x3enja+13JUxOahoTLIbR1wpFYqZHj3NNDPeA8= -SHA256 (Pkgfile) = 636ba30a866350671ffa3bae8ca86a16bd0e094148e1dbf9a7ae1a7e65139ce6 -SHA256 (.footprint) = 5c3e1cb61d0d5070cc1d278ec445757e1913b70cdec30985988d48c2f6ded070 -SHA256 (Vulkan-ValidationLayers-sdk-1.2.162.0.tar.gz) = 80aa9e180b3900598121d7a3ea613665b99aae21bb40268ecafd82df8016c6f5 -SHA256 (fix_shared.patch) = 840af33ab26638c8c29da4a7f284eae6aeb40e01d506eef9851d7e6ee4a8bed0 +RWSwxGo/zH7eXSF5sMQ5rP+rVdi5cRDaIOFMNtymfFqiZXA5V99dyuG++lzIN3czT48RlGL4ZaCaeW/FY4JOa9YFumHZrtNBYgA= +SHA256 (Pkgfile) = ec0ccacb3dd7d34b2e00c3288d8d8d56afa31f0e76651e2c58be85715fb21803 +SHA256 (.footprint) = 42978599405114f2de06e260f58c257c766ba543b5c618e7ff6737cdc175760a +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 diff --git a/vulkan-validation-layers-32/Pkgfile b/vulkan-validation-layers-32/Pkgfile index cc42658b..bda04941 100644 --- a/vulkan-validation-layers-32/Pkgfile +++ b/vulkan-validation-layers-32/Pkgfile @@ -1,31 +1,37 @@ # Description: Vulkan validation layers, 32bit # URL: https://www.khronos.org/vulkan/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu -# Depends on: spirv-tools-32 vulkan-loader-32 vulkan-validation-layers +# Depends on: spirv-tools-32 xorg-libxcb-32 xorg-libx11-32 xorg-libxrandr-32 vulkan-validation-layers # Optional: wayland-32 name=vulkan-validation-layers-32 -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) 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='lib32' \ - -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-32 &> /dev/null && echo ON || echo OFF)" \ + prt-get isinst ninja && PKGMK_VULKAN_VALIDATION_LAYERS+=' -G Ninja' + prt-get isinst wayland-32 || 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=lib32 \ + -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