From d6175216a31d2760f3fb4e41a4a1fb14ac167012 Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Mon, 25 Nov 2019 20:36:53 +0100 Subject: [PATCH] Vulkan-ValidationLayers: update to 1.1.127 --- .../patches/fix-apiversion.patch | 29 ------------------- srcpkgs/Vulkan-ValidationLayers/template | 22 ++++++++------ 2 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 srcpkgs/Vulkan-ValidationLayers/patches/fix-apiversion.patch diff --git a/srcpkgs/Vulkan-ValidationLayers/patches/fix-apiversion.patch b/srcpkgs/Vulkan-ValidationLayers/patches/fix-apiversion.patch deleted file mode 100644 index c7c8691b1a4..00000000000 --- a/srcpkgs/Vulkan-ValidationLayers/patches/fix-apiversion.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/1024 - -From 5e3bf3d651e08cb7464f6c7270a9637239fc13bb Mon Sep 17 00:00:00 2001 -From: John Zulauf -Date: Sat, 29 Jun 2019 07:55:57 -0600 -Subject: [PATCH] layers: Use correct apiversion for properties check - -Change layers property check from physical device apiVersion to the -effective apiVersion (the lesser of the device and CreateInstance -apiVersion values) to avoid invalid downchain call. - -Change-Id: I282950f0f8927df280c97098e775a6940db809f1 ---- - layers/core_validation.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git layers/core_validation.cpp layers/core_validation.cpp -index 03149c08d..75e473af1 100644 ---- layers/core_validation.cpp -+++ layers/core_validation.cpp -@@ -2412,7 +2412,7 @@ void CoreChecks::PostCallRecordCreateDevice(VkPhysicalDevice gpu, const VkDevice - instance_dispatch_table.GetPhysicalDeviceCooperativeMatrixPropertiesNV(gpu, &numCooperativeMatrixProperties, - core_checks->cooperative_matrix_properties.data()); - } -- if (core_checks->phys_dev_props.apiVersion >= VK_API_VERSION_1_1) { -+ if (core_checks->api_version >= VK_API_VERSION_1_1) { - // Get the needed subgroup limits - auto subgroup_prop = lvl_init_struct(); - auto prop2 = lvl_init_struct(&subgroup_prop); diff --git a/srcpkgs/Vulkan-ValidationLayers/template b/srcpkgs/Vulkan-ValidationLayers/template index b239584876b..260880fb4c8 100644 --- a/srcpkgs/Vulkan-ValidationLayers/template +++ b/srcpkgs/Vulkan-ValidationLayers/template @@ -1,16 +1,20 @@ # Template file for 'Vulkan-ValidationLayers' pkgname=Vulkan-ValidationLayers -version=1.1.112 -revision=2 +version=1.1.127 +revision=1 build_style=cmake -configure_args="-DGLSLANG_INSTALL_DIR=/usr - -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr" -hostmakedepends="python3 pkg-config" -makedepends="Vulkan-Headers SPIRV-Tools-devel glslang-devel libXrandr-devel - wayland-devel" -short_desc="Vulkan validation layers" +configure_args="-C ${XBPS_CROSS_BASE}/tmp/helper.cmake" +hostmakedepends="python3 git pkg-config" +makedepends="libXrandr-devel wayland-devel" +short_desc="Khronos official Vulkan validation layers" maintainer="Colin Gillespie " license="Apache-2.0" homepage="https://www.khronos.org/vulkan/" distfiles="https://github.com/KhronosGroup/${pkgname}/archive/v${version}.tar.gz" -checksum=6ba1a0d8082975b4ac39ae01be5e1d5e722247a14a8ac20ce0e9d21a09bfc268 +checksum=2ffe0d899c74ce0fc3c7ba9f90eccd5b3b78e0f90519dee9c701366bc0f795be + +pre_configure() { + # Fetch and compile "known good" versions of dependencies + ./scripts/update_deps.py --dir=${XBPS_CROSS_BASE}/tmp + # NOTE: this directory won't be cleaned by xbps-src clean +}