diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2023-01-20 04:42:25 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2023-01-20 19:36:38 +0000 |
| commit | c1914215f9f89e6e2a776a826b227e54c070f2ea (patch) | |
| tree | 696ac587075404501faa317d90e70148658e81d8 | |
| parent | graphics/vulkan-tools: update to 1.3.239 (diff) | |
graphics/vulkan-validation-layers: update to 1.3.239
Changes: https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/v1.3.238...v1.3.239
Reported by: Repology, portscout
5 files changed, 35 insertions, 52 deletions
diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index 3dad0de0256f..ff8bada3a5db 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -1,14 +1,8 @@ PORTNAME= vulkan-validation-layers DISTVERSIONPREFIX= v -DISTVERSION= 1.3.238 -PORTREVISION= 1 +DISTVERSION= 1.3.239 CATEGORIES= graphics -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 4050be7c1960.patch:-p1 # https://github.com/KhronosGroup/Vulkan-ValidationLayers/pull/5062 -PATCHFILES+= d786eab65863.patch:-p1 # https://github.com/KhronosGroup/Vulkan-ValidationLayers/pull/5087 -PATCHFILES+= f4d438f73a52.patch:-p1 # https://github.com/KhronosGroup/Vulkan-ValidationLayers/pull/5098 - MAINTAINER= jbeich@FreeBSD.org COMMENT= Validation layers for the Vulkan graphics API WWW= https://github.com/KhronosGroup/Vulkan-ValidationLayers @@ -24,7 +18,7 @@ USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-ValidationLayers -GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-207-g1d31a10:headers/external/spirv-headers +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-214-gd13b522:headers/external/spirv-headers CMAKE_OFF= BUILD_TESTS CMAKE_ON= BUILD_LAYER_SUPPORT_FILES CMAKE_ARGS= -DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}" diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo index 0cf9d8344924..58492a06f418 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,11 +1,5 @@ -TIMESTAMP = 1671471267 -SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.238_GH0.tar.gz) = 03bc5843ef965595077958edef314e00aaf6ec42eb3e13c19007352f3dcb768d -SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.238_GH0.tar.gz) = 4523932 -SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-207-g1d31a10_GH0.tar.gz) = 696f3dddde6d732155140131eceba2b290e0e7a7eea18c39bc687a08fce733f1 -SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-207-g1d31a10_GH0.tar.gz) = 445575 -SHA256 (4050be7c1960.patch) = 41fe993e9f7639836b6f0d691104a2f0a035b0c14bf5fa9a3740f8b34114ccf3 -SIZE (4050be7c1960.patch) = 5020 -SHA256 (d786eab65863.patch) = f3b943f50e0061ec91cc055ead8c354e2e3dcb6de22f22115fc7c46157490048 -SIZE (d786eab65863.patch) = 2116 -SHA256 (f4d438f73a52.patch) = ad27fdfc602e59a1ae300d2a49da0c2736cd4e142ebd93a7786a3f75fd1569d3 -SIZE (f4d438f73a52.patch) = 861 +TIMESTAMP = 1674189745 +SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.239_GH0.tar.gz) = 7267aff7993ecac4e9795c57d2f4b0bb50e7c7a21eeea41de251ca6c36adc4fa +SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.239_GH0.tar.gz) = 4545796 +SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-214-gd13b522_GH0.tar.gz) = f4f0663a7fc0c17beaecb824c58ece4169edec1b3bb6eb1f6857b7b56bad3194 +SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-214-gd13b522_GH0.tar.gz) = 446635 diff --git a/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt b/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt deleted file mode 100644 index 3891812819f3..000000000000 --- a/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -CMake Error at CMakeLists.txt:220 (find_package): - Could not find a package configuration file provided by "SPIRV-Headers" - with any of the following names: - - SPIRV-HeadersConfig.cmake - spirv-headers-config.cmake - - Add the installation prefix of "SPIRV-Headers" to CMAKE_PREFIX_PATH or set - "SPIRV-Headers_DIR" to a directory containing one of the above files. If - "SPIRV-Headers" provides a separate development package or SDK, be sure it - has been installed. - ---- CMakeLists.txt.orig 2022-10-28 03:54:50 UTC -+++ CMakeLists.txt -@@ -95,6 +95,8 @@ if (SPIRV_HEADERS_INSTALL_DIR) - endif() - if (SPIRV_HEADERS_INSTALL_DIR) - list(APPEND CMAKE_PREFIX_PATH ${SPIRV_HEADERS_INSTALL_DIR}) -+ add_library(SPIRV-Headers::SPIRV-Headers INTERFACE IMPORTED) -+ target_include_directories(SPIRV-Headers::SPIRV-Headers INTERFACE ${SPIRV_HEADERS_INSTALL_DIR}/include) - endif() - if (SPIRV_TOOLS_INSTALL_DIR) - list(APPEND CMAKE_PREFIX_PATH ${SPIRV_TOOLS_INSTALL_DIR}) -@@ -213,7 +215,9 @@ if(BUILD_LAYERS OR BUILD_TESTS) - endif() - - if(BUILD_LAYERS OR BUILD_TESTS) -+ if (NOT TARGET SPIRV-Headers::SPIRV-Headers) - find_package(SPIRV-Headers REQUIRED CONFIG QUIET) -+ endif() - - include(VVLGenerateSourceCode) - diff --git a/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt b/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt new file mode 100644 index 000000000000..c96d097f56a7 --- /dev/null +++ b/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt @@ -0,0 +1,27 @@ +CMake Error at layers/CMakeLists.txt:114 (find_package): + Could not find a package configuration file provided by "SPIRV-Headers" + with any of the following names: + + SPIRV-HeadersConfig.cmake + spirv-headers-config.cmake + + Add the installation prefix of "SPIRV-Headers" to CMAKE_PREFIX_PATH or set + "SPIRV-Headers_DIR" to a directory containing one of the above files. If + "SPIRV-Headers" provides a separate development package or SDK, be sure it + has been installed. + +--- layers/CMakeLists.txt.orig 2023-01-20 04:42:25 UTC ++++ layers/CMakeLists.txt +@@ -111,7 +111,12 @@ add_library(VVL-SPIRV-LIBS INTERFACE) + # Represents all SPIRV libraries we need + add_library(VVL-SPIRV-LIBS INTERFACE) + ++if (SPIRV_HEADERS_INSTALL_DIR) ++add_library(SPIRV-Headers::SPIRV-Headers INTERFACE IMPORTED) ++target_include_directories(SPIRV-Headers::SPIRV-Headers INTERFACE ${SPIRV_HEADERS_INSTALL_DIR}/include) ++else() + find_package(SPIRV-Headers REQUIRED CONFIG QUIET) ++endif() + target_link_libraries(VVL-SPIRV-LIBS INTERFACE SPIRV-Headers::SPIRV-Headers) + + find_package(SPIRV-Tools-opt REQUIRED CONFIG QUIET) diff --git a/graphics/vulkan-validation-layers/pkg-plist b/graphics/vulkan-validation-layers/pkg-plist index 36ad5502053e..4589b5ce619a 100644 --- a/graphics/vulkan-validation-layers/pkg-plist +++ b/graphics/vulkan-validation-layers/pkg-plist @@ -12,6 +12,7 @@ include/vulkan/vk_layer_data.h include/vulkan/vk_layer_dispatch_table.h include/vulkan/vk_layer_extension_utils.cpp include/vulkan/vk_layer_extension_utils.h +include/vulkan/vk_layer_logging.cpp include/vulkan/vk_layer_logging.h include/vulkan/vk_layer_utils.cpp include/vulkan/vk_layer_utils.h |