git: 7246984db03c - main - graphics/vulkan-validation-layers: update to 1.3.261

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7246984db03c8ef3f4916d8624fadb5b43532eff

commit 7246984db03c8ef3f4916d8624fadb5b43532eff
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-08-06 12:00:24 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-08-07 13:26:18 +0000

    graphics/vulkan-validation-layers: update to 1.3.261
    
    Changes:        https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/v1.3.260...v1.3.261
    Reported by:    Repology, portscout
---
 graphics/vulkan-validation-layers/Makefile         |  7 +---
 graphics/vulkan-validation-layers/distinfo         |  8 ++--
 .../vulkan-validation-layers/files/patch-revert    | 47 ++++++++++++++++++++++
 3 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile
index 1b53682c7893..e9b890a8476c 100644
--- a/graphics/vulkan-validation-layers/Makefile
+++ b/graphics/vulkan-validation-layers/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vulkan-validation-layers
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.3.260
+DISTVERSION=	1.3.261
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -23,11 +23,6 @@ CMAKE_OFF=	BUILD_TESTS
 CMAKE_ON=	BUILD_LAYER_SUPPORT_FILES
 CMAKE_ARGS=	-DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}"
 
-.if ${DISTVERSION:E} < 261
-GH_TUPLE+=	KhronosGroup:Vulkan-Headers:v1.3.260:vkheaders/Vulkan-Headers
-CFLAGS+=	-I${WRKSRC_vkheaders}/include
-.endif
-
 OPTIONS_DEFINE=	WAYLAND XCB XLIB
 OPTIONS_DEFAULT=WAYLAND XCB XLIB
 
diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo
index 782320086ffc..c79d41271084 100644
--- a/graphics/vulkan-validation-layers/distinfo
+++ b/graphics/vulkan-validation-layers/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1690939084
-SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.260_GH0.tar.gz) = f7dcafcfad08c5817b502416474138fba9ec7a9cdaf0289782ba2ee448d3e585
-SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.260_GH0.tar.gz) = 4872653
+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
-SHA256 (KhronosGroup-Vulkan-Headers-v1.3.260_GH0.tar.gz) = f6e44769c42685fd5d380aea280a2406a431fe584d7ae3256ce83958cd0899f4
-SIZE (KhronosGroup-Vulkan-Headers-v1.3.260_GH0.tar.gz) = 2044625
diff --git a/graphics/vulkan-validation-layers/files/patch-revert b/graphics/vulkan-validation-layers/files/patch-revert
new file mode 100644
index 000000000000..ccca9c0e9972
--- /dev/null
+++ b/graphics/vulkan-validation-layers/files/patch-revert
@@ -0,0 +1,47 @@
+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