commit 6d4ef33f0220574cfa1e23c6490418cad70f71ef Author: Danny Rawlins <monster.romster@gmail.com> Date: Sun Jun 7 18:01:27 2020 +1000 vulkan-validation-layers: 1.1.126.0 -> 1.2.135.0 diff --git a/vulkan-validation-layers/.footprint b/vulkan-validation-layers/.footprint index 312c7c855..2c61499d1 100644 --- a/vulkan-validation-layers/.footprint +++ b/vulkan-validation-layers/.footprint @@ -24,6 +24,8 @@ drwxr-xr-x root/root usr/include/vulkan/ -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/lib/ -rwxr-xr-x root/root usr/lib/libVkLayer_khronos_validation.so -rwxr-xr-x root/root usr/lib/libVkLayer_utils.so @@ -31,4 +33,3 @@ 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/ -rw-r--r-- root/root usr/share/vulkan/explicit_layer.d/VkLayer_khronos_validation.json --rw-r--r-- root/root usr/share/vulkan/explicit_layer.d/VkLayer_standard_validation.json diff --git a/vulkan-validation-layers/.signature b/vulkan-validation-layers/.signature index f95f227aa..5c0014ef2 100644 --- a/vulkan-validation-layers/.signature +++ b/vulkan-validation-layers/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/aHsTPCILVzW9hMt62eOZKebMArTdFy1+zkKm8dK86FDa2JPDifvqi51WErBBsrYYQCFUb/9uFvSex/p4WrvHw4= -SHA256 (Pkgfile) = 66ac8fa7fcb93ec0e087fbe2a0df196a96dc272fe2b0343b3e5e4bfb60a84fbb -SHA256 (.footprint) = 276e01962e8061926594f0062928e4a6c25f009fed407a7584a902b532eaf164 -SHA256 (Vulkan-ValidationLayers-sdk-1.1.126.0.tar.gz) = 8a7ea6a7aed1fb7de58638448c8fda8f4681554cad98f3f1c6e3a6e023f08c39 +RWSE3ohX2g5d/R2+i0fMep51//ArIHE/Tlt5P6Sl+1vkDHw3Pw8qu4obnhn5conOa4afQUnBH9figoKMDi2S6VvG23+YKDttnwU= +SHA256 (Pkgfile) = 68a2992eda19e46119cdf36c69731f5936417a1e2be9eb09d3d6270c061bbf9d +SHA256 (.footprint) = cd0824869148d109d026a99a0393dd24215cedf6341979627c5b49957a634e5f +SHA256 (Vulkan-ValidationLayers-sdk-1.2.135.0.tar.gz) = 7a33aa13d9526da4deb945b3ccf5be9cf3c99fb4dfce2caf57640746c1c648d3 SHA256 (fix_shared.patch) = 840af33ab26638c8c29da4a7f284eae6aeb40e01d506eef9851d7e6ee4a8bed0 diff --git a/vulkan-validation-layers/Pkgfile b/vulkan-validation-layers/Pkgfile index eedd10a6f..f827d9092 100644 --- a/vulkan-validation-layers/Pkgfile +++ b/vulkan-validation-layers/Pkgfile @@ -4,33 +4,27 @@ # Depends on: glslang vulkan-loader name=vulkan-validation-layers -version=1.1.126.0 -release=2 +version=1.2.135.0 +release=1 source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$version... fix_shared.patch) build() { - cd Vulkan-ValidationLayers-sdk-$version + patch -d Vulkan-ValidationLayers-sdk-$version -p1 -i $SRC/fix_shared.patch - patch -p1 -i $SRC/fix_shared.patch - - mkdir build - cd build - - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ + cmake -SVulkan-ValidationLayers-sdk-$version -Bbuild -GNinja \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_INSTALL_LIBDIR='lib' \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=True \ - -DBUILD_TESTS=False \ - -DGLSLANG_INSTALL_DIR=/usr \ - -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/vulkan/ \ + -DCMAKE_SKIP_RPATH=ON \ + -DBUILD_TESTS=OFF \ + -DGLSLANG_INSTALL_DIR='/usr' \ + -DCMAKE_INSTALL_INCLUDEDIR='/usr/include/vulkan/' \ -DBUILD_LAYER_SUPPORT_FILES=ON \ -DBUILD_WSI_XCB_SUPPORT=ON \ -DBUILD_WSI_XLIB_SUPPORT=ON \ - -DBUILD_WSI_WAYLAND_SUPPORT=$(prt-get isinst wayland &> /dev/null && echo ON || echo OFF) \ - -GNinja + -DBUILD_WSI_WAYLAND_SUPPORT="$(prt-get isinst wayland &> /dev/null && echo ON || echo OFF)" - ninja -j ${JOBS:-1} - DESTDIR=$PKG ninja install + cmake --build build + DESTDIR=$PKG cmake --build build --target install }