diff options
| author | Danny Rawlins <monster.romster@gmail.com> | 2020-07-24 01:26:55 +1000 |
|---|---|---|
| committer | Danny Rawlins <monster.romster@gmail.com> | 2020-07-24 20:06:56 +1000 |
| commit | 8b43866c3f0f0828063846de310a2c63c263a957 (patch) | |
| tree | d783f3e015e7a02d27b3214823f96fae3860acde /vulkan-validation-layers | |
| parent | 7146ed03eb03ca9b43b8fa6a917fb030c451a039 (diff) | |
| download | opt-8b43866c3f0f0828063846de310a2c63c263a957.tar.gz opt-8b43866c3f0f0828063846de310a2c63c263a957.tar.xz | |
vulkan-validation-layers: 1.2.135.0 -> 1.2.141
Diffstat (limited to 'vulkan-validation-layers')
| -rw-r--r-- | vulkan-validation-layers/.signature | 7 | ||||
| -rw-r--r-- | vulkan-validation-layers/16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch | 30 | ||||
| -rw-r--r-- | vulkan-validation-layers/Pkgfile | 15 |
3 files changed, 43 insertions, 9 deletions
diff --git a/vulkan-validation-layers/.signature b/vulkan-validation-layers/.signature index 8f93be007..21f2287c0 100644 --- a/vulkan-validation-layers/.signature +++ b/vulkan-validation-layers/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/cb79Mgd9xCIhs6yaC2g9X7MHTqyI3reL08zp+0j+V4JX/eYVyGf4X94Xwia+HSo79zl42RbdDNrmdMNT+MtAQE= -SHA256 (Pkgfile) = 9747b905ad6ff3790a47f4c8f1766f0e1a0bf2c81c47e0786a43294593caab86 +RWSE3ohX2g5d/ZlIqDQS6fSeX0oW9N4euIMOoktI1Ho5OMUa4p7E5bHndAQCNwUv1xw0UIYf9E3mbnWc80VJSPUnxb07dHKwrAQ= +SHA256 (Pkgfile) = cf8a58f5bb2735a87d475a29dfc6feb7b0556f1fb4cd56c79a5e653e0be63999 SHA256 (.footprint) = cd0824869148d109d026a99a0393dd24215cedf6341979627c5b49957a634e5f -SHA256 (Vulkan-ValidationLayers-sdk-1.2.135.0.tar.gz) = 7a33aa13d9526da4deb945b3ccf5be9cf3c99fb4dfce2caf57640746c1c648d3 +SHA256 (Vulkan-ValidationLayers-v1.2.141.tar.gz) = 3f2ebc5c0d69ead2031893f5c5da9bb4f328a90d30c1665a618a637a48d27ee0 SHA256 (fix_shared.patch) = 840af33ab26638c8c29da4a7f284eae6aeb40e01d506eef9851d7e6ee4a8bed0 +SHA256 (16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch) = cb8d8bb4526c57460d7f8cdc3c09c4360fdf1f1bce7f3505d52aab0363af1c8a diff --git a/vulkan-validation-layers/16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch b/vulkan-validation-layers/16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch new file mode 100644 index 000000000..e332ef0f7 --- /dev/null +++ b/vulkan-validation-layers/16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch @@ -0,0 +1,30 @@ +From 16d17ebf3762f24b3eb06e04843efb7f7dbf8438 Mon Sep 17 00:00:00 2001 +From: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com> +Date: Tue, 10 Dec 2019 11:23:23 -0800 +Subject: [PATCH] build: Fix Vulkan registry detection + +Fix incomplete VULKAN_REGISTRY_PATH_HINT for the case where +VULKAN_HEADERS_INSTALL_DIR is not specified. The hint extracted the +DIRECTORY of the include dir (e.g. "/usr"), but missed the rest of the +expected path for finding vk.xml (e.g. "/usr/share/vulkan/registry"). + +Tested with CMake 3.16.0. + +Fixes: 18664450a ("build: Fix Vulkan headers detection with CMake.") +--- + cmake/FindVulkanHeaders.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/FindVulkanHeaders.cmake b/cmake/FindVulkanHeaders.cmake +index 68e261159..1c71ffe10 100644 +--- a/cmake/FindVulkanHeaders.cmake ++++ b/cmake/FindVulkanHeaders.cmake +@@ -76,7 +76,7 @@ else() + # do a normal search without hints. + find_path(VulkanHeaders_INCLUDE_DIR NAMES vulkan/vulkan.h) + get_filename_component(VULKAN_REGISTRY_PATH_HINT ${VulkanHeaders_INCLUDE_DIR} DIRECTORY) +- find_path(VulkanRegistry_DIR NAMES vk.xml HINTS ${VULKAN_REGISTRY_PATH_HINT}) ++ find_path(VulkanRegistry_DIR NAMES vk.xml HINTS /usr/share/vulkan/registry) + endif() + + set(VulkanHeaders_INCLUDE_DIRS ${VulkanHeaders_INCLUDE_DIR}) diff --git a/vulkan-validation-layers/Pkgfile b/vulkan-validation-layers/Pkgfile index 7c82ae21e..fb1a57d53 100644 --- a/vulkan-validation-layers/Pkgfile +++ b/vulkan-validation-layers/Pkgfile @@ -4,15 +4,17 @@ # Depends on: glslang vulkan-loader name=vulkan-validation-layers -version=1.2.135.0 +version=1.2.141 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-v$version.tar.gz + fix_shared.patch + 16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch) build() { - patch -d Vulkan-ValidationLayers-sdk-$version -p1 -i $SRC/fix_shared.patch + patch -d Vulkan-ValidationLayers-$version -p1 -i $SRC/fix_shared.patch + patch -d Vulkan-ValidationLayers-$version -p1 -i $SRC/16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch - cmake -SVulkan-ValidationLayers-sdk-$version -Bbuild -GNinja \ + cmake -SVulkan-ValidationLayers-$version -Bbuild -GNinja \ -DCMAKE_INSTALL_PREFIX='/usr' \ -DCMAKE_INSTALL_LIBDIR='lib' \ -DCMAKE_BUILD_TYPE=Release \ @@ -23,7 +25,8 @@ build() { -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)" + -DBUILD_WSI_WAYLAND_SUPPORT="$(prt-get isinst wayland &> /dev/null && echo ON || echo OFF)" \ + -Wno-dev cmake --build build DESTDIR=$PKG cmake --install build |