git: da82be3edfb7 - main - graphics/vulkan-tools: update to 1.3.299

The branch main has been updated by jbeich:

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

commit da82be3edfb7aac7469a9f47950f02a8d39c481e
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-10-18 17:08:41 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-10-18 22:12:09 +0000

    graphics/vulkan-tools: update to 1.3.299
    
    vkcube-wayland became vkcube --wsi wayland. Ditto for other WSI per
    https://github.com/KhronosGroup/Vulkan-Tools/commit/f12bc32cddc3
    
    Changes:        https://github.com/KhronosGroup/Vulkan-Tools/compare/v1.3.298...v1.3.299
    Reported by:    Repology, portscout
    PR:             246199
    
    This reverts commit acc8ee9744f69c31adb6cd244d2635c3032d1128.
---
 graphics/vulkan-tools/Makefile  | 27 +++------------------------
 graphics/vulkan-tools/distinfo  | 10 +++++-----
 graphics/vulkan-tools/pkg-plist | 10 ++--------
 3 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile
index 938b13ce82d4..4be06ccdc24f 100644
--- a/graphics/vulkan-tools/Makefile
+++ b/graphics/vulkan-tools/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vulkan-tools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.3.298
+DISTVERSION=	1.3.299
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -16,14 +16,12 @@ USES=		alias cmake compiler:c++11-lib pkgconfig python:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-Tools
-GH_TUPLE=	zeux:volk:1.3.295-8-g0a610bc:volk/volk
-CMAKE_OFF=	BUILD_CUBE BUILD_ICD
+GH_TUPLE=	zeux:volk:1.3.295-10-g086957f:volk/volk
+CMAKE_OFF=	BUILD_ICD
 CMAKE_ARGS=	-DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}"
 
 OPTIONS_DEFINE=		WAYLAND XCB XLIB
 OPTIONS_DEFAULT=	WAYLAND XCB XLIB
-OPTIONS_SLAVE=		DISPLAY
-OPTIONS_SUB=		yes
 
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
@@ -41,23 +39,4 @@ XLIB_USES=		xorg
 XLIB_USE=		XORG=x11
 XLIB_CMAKE_BOOL=	BUILD_WSI_XLIB_SUPPORT
 
-# https://github.com/KhronosGroup/Vulkan-Tools/issues/307
-.for _wsi in display wayland xcb xlib
-do-configure-${_wsi:tu}-on: ${_wsi}-configure
-${_wsi}-configure:
-	@${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} \
-		-DBUILD_CUBE:BOOL=ON -DBUILD_VULKANINFO:BOOL=OFF \
-		-DCUBE_WSI_SELECTION:STRING=${_wsi:tu} \
-		-B${CONFIGURE_WRKSRC}-${_wsi}
-do-build-${_wsi:tu}-on: ${_wsi}-build
-${_wsi}-build:
-	@${SETENV} ${MAKE_ENV} ${CMAKE_BIN} --build ${BUILD_WRKSRC}-${_wsi}
-do-install-${_wsi:tu}-on: ${_wsi}-install
-${_wsi}-install:
-. for _file in vkcube vkcubepp
-	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}-${_wsi}/cube/${_file} \
-		${STAGEDIR}${PREFIX}/bin/${_file}-${_wsi}
-. endfor
-.endfor
-
 .include <bsd.port.mk>
diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo
index eab629973f9d..dc9591c1dbc7 100644
--- a/graphics/vulkan-tools/distinfo
+++ b/graphics/vulkan-tools/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1728667595
-SHA256 (KhronosGroup-Vulkan-Tools-v1.3.298_GH0.tar.gz) = 848aa2a9deb41f2fc2c7cad8537c956a9caf67059e7f37c8ee47fb777bd401d7
-SIZE (KhronosGroup-Vulkan-Tools-v1.3.298_GH0.tar.gz) = 757540
-SHA256 (zeux-volk-1.3.295-8-g0a610bc_GH0.tar.gz) = e6787fce40cd7cf26db98af559e717d34cc430c56bf3c242d806eb666311c8c3
-SIZE (zeux-volk-1.3.295-8-g0a610bc_GH0.tar.gz) = 64241
+TIMESTAMP = 1729271321
+SHA256 (KhronosGroup-Vulkan-Tools-v1.3.299_GH0.tar.gz) = 85f3cd64df1e7a1f06b2a660b5be55b1b2c66670100c2b28abb29436ba53e945
+SIZE (KhronosGroup-Vulkan-Tools-v1.3.299_GH0.tar.gz) = 765694
+SHA256 (zeux-volk-1.3.295-10-g086957f_GH0.tar.gz) = 8d5af558415bd6434d250e045d02ec45c173a60d9414eed140fe49013e0555b0
+SIZE (zeux-volk-1.3.295-10-g086957f_GH0.tar.gz) = 64273
diff --git a/graphics/vulkan-tools/pkg-plist b/graphics/vulkan-tools/pkg-plist
index f18aa4b6c456..1419af7e32d6 100644
--- a/graphics/vulkan-tools/pkg-plist
+++ b/graphics/vulkan-tools/pkg-plist
@@ -1,9 +1,3 @@
-%%DISPLAY%%bin/vkcube-display
-%%WAYLAND%%bin/vkcube-wayland
-%%XCB%%bin/vkcube-xcb
-%%XLIB%%bin/vkcube-xlib
-%%DISPLAY%%bin/vkcubepp-display
-%%WAYLAND%%bin/vkcubepp-wayland
-%%XCB%%bin/vkcubepp-xcb
-%%XLIB%%bin/vkcubepp-xlib
+bin/vkcube
+bin/vkcubepp
 bin/vulkaninfo