diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index e9b890a8476c..284d42f2b3af 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -1,45 +1,45 @@ PORTNAME= vulkan-validation-layers DISTVERSIONPREFIX= v -DISTVERSION= 1.3.261 +DISTVERSION= 1.3.262 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Validation layers for the Vulkan graphics API WWW= https://github.com/KhronosGroup/Vulkan-ValidationLayers LICENSE= APACHE20 BUILD_DEPENDS= robin-hood-hashing>0:devel/robin-hood-hashing \ spirv-tools>0:graphics/spirv-tools \ vulkan-headers>0:graphics/vulkan-headers USES= alias cmake compiler:c++11-lib pkgconfig python:build USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-ValidationLayers -GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-284-g3469b16:headers/external/spirv-headers +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-316-gd790ced:headers/external/spirv-headers CMAKE_OFF= BUILD_TESTS CMAKE_ON= BUILD_LAYER_SUPPORT_FILES CMAKE_ARGS= -DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}" OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT=WAYLAND XCB XLIB WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT XCB_DESC= ${X11_DESC} via libxcb XCB_USES= xorg XCB_USE= XORG=xcb XCB_CMAKE_BOOL= BUILD_WSI_XCB_SUPPORT XLIB_DESC= ${X11_DESC} via libX11 XLIB_USES= xorg XLIB_USE= XORG=x11,xrandr XLIB_CMAKE_BOOL= BUILD_WSI_XLIB_SUPPORT post-install: @${RMDIR} ${STAGEDIR}${PREFIX}/include/vulkan/external/vma .include diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo index c79d41271084..e6b045964d9c 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1691323224 -SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.261_GH0.tar.gz) = ab769d9d7550e1636c9309387a7e53be5ba89f0b19f810bb40caa1b6eaefe8ee -SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.261_GH0.tar.gz) = 4858473 -SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-284-g3469b16_GH0.tar.gz) = 202a623685e0cf376d92ee34649c66ba4bc34cc403e226947ed5e626ff3654a6 -SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-284-g3469b16_GH0.tar.gz) = 455615 +TIMESTAMP = 1693279416 +SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.262_GH0.tar.gz) = b9dabba2e718e4f19763b0883ed8e6b714045267940e3073f2e60d7a0383f485 +SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.262_GH0.tar.gz) = 4989348 +SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-316-gd790ced_GH0.tar.gz) = 4677f51365937acb78df4067359d32742c5c649f2beb8f8afb7e1002329cea46 +SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-316-gd790ced_GH0.tar.gz) = 463700 diff --git a/graphics/vulkan-validation-layers/files/patch-revert b/graphics/vulkan-validation-layers/files/patch-revert deleted file mode 100644 index ccca9c0e9972..000000000000 --- a/graphics/vulkan-validation-layers/files/patch-revert +++ /dev/null @@ -1,47 +0,0 @@ -Revert https://github.com/KhronosGroup/Vulkan-ValidationLayers/commit/c6228c5eee5c -as unused until https://github.com/KhronosGroup/Vulkan-ValidationLayers/pull/6088 - ---- CMakeLists.txt.orig 2023-08-06 12:00:24 UTC -+++ CMakeLists.txt -@@ -68,8 +68,6 @@ endif() - endif() - endif() - --find_package(VulkanUtilityLibraries REQUIRED CONFIG QUIET) -- - if (ANNOTATED_SPEC_LINK) - message("ANNOTATED_SPEC_LINK is ${ANNOTATED_SPEC_LINK}") - add_compile_definitions(ANNOTATED_SPEC_LINK=${ANNOTATED_SPEC_LINK}) ---- layers/CMakeLists.txt.orig 2023-08-06 12:00:24 UTC -+++ layers/CMakeLists.txt -@@ -392,7 +392,7 @@ endif() - endif() - # Order matters here. VkLayer_utils should be the last link library to ensure mimalloc overrides are picked up correctly. - # Otherwise, libraries after VkLayer_utils will not benefit from this performance improvement. --target_link_libraries(vvl PRIVATE VVL-SPIRV-LIBS Vulkan::LayerSettings VkLayer_utils) -+target_link_libraries(vvl PRIVATE VVL-SPIRV-LIBS VkLayer_utils) - - # Using mimalloc on non-Windows OSes currently results in unit test instability with some - # OS version / driver combinations. On 32-bit systems, using mimalloc cause an increase in ---- scripts/CMakeLists.txt.orig 2023-08-06 12:00:24 UTC -+++ scripts/CMakeLists.txt -@@ -127,9 +127,6 @@ endif() - if (VULKAN_HEADERS_INSTALL_DIR) - list(APPEND CMAKE_PREFIX_PATH ${VULKAN_HEADERS_INSTALL_DIR}) - endif() --if (VULKAN_UTILITY_LIBRARIES_INSTALL_DIR) -- list(APPEND CMAKE_PREFIX_PATH ${VULKAN_UTILITY_LIBRARIES_INSTALL_DIR}) --endif() - if (MIMALLOC_INSTALL_DIR) - list(APPEND CMAKE_PREFIX_PATH ${MIMALLOC_INSTALL_DIR}) - endif() ---- tests/CMakeLists.txt.orig 2023-08-06 12:00:24 UTC -+++ tests/CMakeLists.txt -@@ -193,7 +193,6 @@ target_link_libraries(vk_layer_validation_tests PRIVAT - - target_link_libraries(vk_layer_validation_tests PRIVATE - VkLayer_utils -- Vulkan::LayerSettings - glslang::glslang - glslang::OGLCompiler - glslang::OSDependent diff --git a/graphics/vulkan-validation-layers/pkg-plist b/graphics/vulkan-validation-layers/pkg-plist index 6a097b2bd110..79b2c815c345 100644 --- a/graphics/vulkan-validation-layers/pkg-plist +++ b/graphics/vulkan-validation-layers/pkg-plist @@ -1,35 +1,36 @@ include/vulkan/containers/custom_containers.h include/vulkan/error_message/logging.cpp include/vulkan/error_message/logging.h include/vulkan/external/xxhash.cpp include/vulkan/external/xxhash.h +include/vulkan/generated/vk_api_version.h include/vulkan/generated/vk_dispatch_table_helper.h include/vulkan/generated/vk_enum_string_helper.h include/vulkan/generated/vk_extension_helper.h include/vulkan/generated/vk_format_utils.cpp include/vulkan/generated/vk_format_utils.h include/vulkan/generated/vk_layer_dispatch_table.h include/vulkan/generated/vk_object_types.h include/vulkan/generated/vk_safe_struct.h include/vulkan/generated/vk_safe_struct_core.cpp include/vulkan/generated/vk_safe_struct_ext.cpp include/vulkan/generated/vk_safe_struct_khr.cpp include/vulkan/generated/vk_safe_struct_utils.cpp include/vulkan/generated/vk_safe_struct_vendor.cpp include/vulkan/generated/vk_typemap_helper.h include/vulkan/generated/vk_validation_error_messages.h include/vulkan/utils/cast_utils.h include/vulkan/utils/hash_util.h include/vulkan/utils/hash_vk_types.h include/vulkan/utils/ray_tracing_utils.cpp include/vulkan/utils/ray_tracing_utils.h include/vulkan/utils/vk_layer_extension_utils.cpp include/vulkan/utils/vk_layer_extension_utils.h include/vulkan/utils/vk_layer_utils.cpp include/vulkan/utils/vk_layer_utils.h include/vulkan/vk_enum_string_helper.h include/vulkan/vk_layer_config.cpp include/vulkan/vk_layer_config.h lib/libVkLayer_khronos_validation.so lib/libVkLayer_utils.a share/vulkan/explicit_layer.d/VkLayer_khronos_validation.json