diff --git a/vulkan-validation-layers-32/.footprint b/vulkan-validation-layers-32/.footprint index df1b7ba5..2ac3f383 100644 --- a/vulkan-validation-layers-32/.footprint +++ b/vulkan-validation-layers-32/.footprint @@ -1,4 +1,3 @@ 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 diff --git a/vulkan-validation-layers-32/.signature b/vulkan-validation-layers-32/.signature index 921a70ce..58dd1e7e 100644 --- a/vulkan-validation-layers-32/.signature +++ b/vulkan-validation-layers-32/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXf4Sqzv0NKRL8IMkPYaE/EfQ+4VLaIA8VMrqliygYc1Y2MH5QQzTf3dISGl2Z23eLhAs4U9Sw7RYpklZnSv31gI= -SHA256 (Pkgfile) = 33d8a4cd1fcce58ff7fa5cb18141e5e4d9caed2621c4362f701f91740c30a164 -SHA256 (.footprint) = 5c3e1cb61d0d5070cc1d278ec445757e1913b70cdec30985988d48c2f6ded070 -SHA256 (Vulkan-ValidationLayers-1.3.261.1.tar.gz) = 1372d522f297bb3fb386802b1aa4b7f885a9e1e969a6a3c6e9b29d381357f21d -SHA256 (vulkan-layers-1.3.250-Build-shared-libs.patch) = 463df0636e392de2f2cd8a386abb426b1716155d7b982fb1d19560957158768a +RWSwxGo/zH7eXU+3esY8Ov+Hl9PukwG4AqCfdodbH0pwDGAUfMPzkulcpcLtDevZhwnPLv5xNNwa/T3CWiS2fctM5sxT/ekZLgw= +SHA256 (Pkgfile) = 6291d7b8f892a30006eabe720134f7101fe78e561d6e4ad5b3c9c4da5cd96646 +SHA256 (.footprint) = 108accda2c1febc3ea2f78090215aeea7697149adc4849d7ed46417626eb511f +SHA256 (Vulkan-ValidationLayers-1.3.268.0.tar.gz) = 7f6912ab49c2d379dd9ede59b4257d13dcac218ecd43df395a7d5914c7dfd024 diff --git a/vulkan-validation-layers-32/Pkgfile b/vulkan-validation-layers-32/Pkgfile index 93f9c04b..977f11e0 100644 --- a/vulkan-validation-layers-32/Pkgfile +++ b/vulkan-validation-layers-32/Pkgfile @@ -1,21 +1,20 @@ # 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-validation-layers xorg-libxrandr-32 robin-hood-hashing-32 +# Depends on: robin-hood-hashing-32 spirv-tools-32 vulkan-utility-libraries-32 vulkan-validation-layers xorg-libxrandr-32 # Optional: wayland-32 name=vulkan-validation-layers-32 -version=1.3.261.1 +_name=Vulkan-ValidationLayers +version=1.3.268.0 +_version=vulkan-sdk-$version release=1 -source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$version/Vulkan-ValidationLayers-$version.tar.gz - vulkan-layers-1.3.250-Build-shared-libs.patch) +source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/$_version/$_name-$version.tar.gz) build() { - patch -d Vulkan-ValidationLayers-sdk-$version -p1 -i $SRC/vulkan-layers-1.3.250-Build-shared-libs.patch - prt-get isinst wayland-32 || PKGMK_VULKAN_VALIDATION_LAYERS+=' -D BUILD_WSI_WAYLAND_SUPPORT=OFF' - cmake -S Vulkan-ValidationLayers-sdk-$version -B build -G Ninja $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=lib32 \ -D CMAKE_BUILD_TYPE=Release \ @@ -30,5 +29,5 @@ build() { cmake --build build DESTDIR=$PKG cmake --install build - rm -r $PKG/usr/{include,share} + rm -r $PKG/usr/share } diff --git a/vulkan-validation-layers-32/vulkan-layers-1.3.250-Build-shared-libs.patch b/vulkan-validation-layers-32/vulkan-layers-1.3.250-Build-shared-libs.patch deleted file mode 100644 index e9809f65..00000000 --- a/vulkan-validation-layers-32/vulkan-layers-1.3.250-Build-shared-libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur Vulkan-ValidationLayers-sdk-1.3.250.0.orig/layers/CMakeLists.txt Vulkan-ValidationLayers-sdk-1.3.250.0/layers/CMakeLists.txt ---- Vulkan-ValidationLayers-sdk-1.3.250.0.orig/layers/CMakeLists.txt 2023-06-03 23:41:45.413654735 +0200 -+++ Vulkan-ValidationLayers-sdk-1.3.250.0/layers/CMakeLists.txt 2023-06-03 23:42:07.317206158 +0200 -@@ -21,7 +21,7 @@ - set(API_TYPE "vulkan") - set(LAYER_NAME "VkLayer_khronos_validation") - --add_library(VkLayer_utils STATIC) -+add_library(VkLayer_utils SHARED) - target_sources(VkLayer_utils PRIVATE - containers/custom_containers.h - error_message/logging.h