git: 0cdab5663334 - main - graphics/vulkan-caps-viewer: update to 4.00

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Fri, 06 Dec 2024 19:36:55 UTC
The branch main has been updated by jbeich:

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

commit 0cdab5663334cf640685fea70c7e45d72f7d57bd
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-12-06 09:08:01 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-12-06 19:36:38 +0000

    graphics/vulkan-caps-viewer: update to 4.00
    
    Changes:        https://github.com/SaschaWillems/VulkanCapsViewer/releases/tag/4.00
    Reported by:    GitHub (watch releases)
---
 graphics/vulkan-caps-viewer/Makefile               | 11 ++++-------
 graphics/vulkan-caps-viewer/distinfo               | 14 +++++---------
 graphics/vulkan-caps-viewer/files/patch-no-wayland | 20 ++++++++++++++++++++
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/graphics/vulkan-caps-viewer/Makefile b/graphics/vulkan-caps-viewer/Makefile
index 9051486a7c27..4af574c21851 100644
--- a/graphics/vulkan-caps-viewer/Makefile
+++ b/graphics/vulkan-caps-viewer/Makefile
@@ -1,11 +1,7 @@
 PORTNAME=	vulkan-caps-viewer
-DISTVERSION=	3.43
+DISTVERSION=	4.00
 CATEGORIES=	graphics
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	de463e2fce3f.patch:-p1 # https://github.com/SaschaWillems/VulkanCapsViewer/pull/109
-PATCHFILES+=	265922e7ddc9.patch:-p1 # https://github.com/SaschaWillems/VulkanCapsViewer/pull/109
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Vulkan Hardware Capability Viewer
 WWW=		https://vulkan.gpuinfo.org/
@@ -19,7 +15,7 @@ USE_GITHUB=	yes
 USE_QT=		qmake:build buildtools:build core gui network widgets
 GH_ACCOUNT=	SaschaWillems
 GH_PROJECT=	VulkanCapsViewer
-GH_TUPLE=	KhronosGroup:Vulkan-Headers:v1.3.296:vkheaders/Vulkan-Headers
+GH_TUPLE=	KhronosGroup:Vulkan-Headers:v1.4.303:vkheaders/Vulkan-Headers
 LDFLAGS+=	-Wl,--as-needed # avoid overlinking (GL, wayland)
 PLIST_FILES=	bin/vulkanCapsViewer \
 		share/applications/vulkanCapsViewer.desktop \
@@ -33,7 +29,8 @@ WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 WAYLAND_USE=		QT=wayland:build
 WAYLAND_QMAKE_ON=	DEFINES+=WAYLAND
 
-X11_USE=		QT=x11extras
+X11_USES=		xorg
+X11_USE=		XORG=xcb
 X11_QMAKE_ON=		DEFINES+=X11
 
 post-patch:
diff --git a/graphics/vulkan-caps-viewer/distinfo b/graphics/vulkan-caps-viewer/distinfo
index afc6f66208b1..06acb1e1b0cb 100644
--- a/graphics/vulkan-caps-viewer/distinfo
+++ b/graphics/vulkan-caps-viewer/distinfo
@@ -1,9 +1,5 @@
-TIMESTAMP = 1727886882
-SHA256 (SaschaWillems-VulkanCapsViewer-3.43_GH0.tar.gz) = c6c6aa2f2df62f5559ca7e4e104f13faa7f47eaa941b5546ed3c3a40232fca9b
-SIZE (SaschaWillems-VulkanCapsViewer-3.43_GH0.tar.gz) = 2862798
-SHA256 (KhronosGroup-Vulkan-Headers-v1.3.296_GH0.tar.gz) = e204e0b3c19f622d197df945737f5db913d6621830999b8578d34e80a7c90585
-SIZE (KhronosGroup-Vulkan-Headers-v1.3.296_GH0.tar.gz) = 2358613
-SHA256 (de463e2fce3f.patch) = 67f03cec1e8ac91a1daf09a88aa96cb47c89549f84b4ef8426d180362cd92e02
-SIZE (de463e2fce3f.patch) = 2078
-SHA256 (265922e7ddc9.patch) = 893f57d7f2ec7059d7241fdae47df76e3be6d13de4a6a21ce7d8624d5b67422f
-SIZE (265922e7ddc9.patch) = 2062
+TIMESTAMP = 1733476081
+SHA256 (SaschaWillems-VulkanCapsViewer-4.00_GH0.tar.gz) = bd077205c14529ab3362290e9dc6f8c7a3e78a58057678bdde42c937eb6d36c3
+SIZE (SaschaWillems-VulkanCapsViewer-4.00_GH0.tar.gz) = 2865905
+SHA256 (KhronosGroup-Vulkan-Headers-v1.4.303_GH0.tar.gz) = fdf0e2e05356b455137ff97f837c9689ba253ec7d20f87ad81575b9bdbe7fdd4
+SIZE (KhronosGroup-Vulkan-Headers-v1.4.303_GH0.tar.gz) = 2440533
diff --git a/graphics/vulkan-caps-viewer/files/patch-no-wayland b/graphics/vulkan-caps-viewer/files/patch-no-wayland
new file mode 100644
index 000000000000..34407f6b57f3
--- /dev/null
+++ b/graphics/vulkan-caps-viewer/files/patch-no-wayland
@@ -0,0 +1,20 @@
+https://github.com/SaschaWillems/VulkanCapsViewer/issues/229
+
+--- vulkancapsviewer.cpp.orig	2024-12-06 09:08:01 UTC
++++ vulkancapsviewer.cpp
+@@ -813,6 +813,7 @@ bool VulkanCapsViewer::initVulkan()
+             };
+ 
+             const auto wayland_display = wl_display_connect(nullptr);
++            if (wayland_display) {
+             const auto wayland_registry = wl_display_get_registry(wayland_display);
+             uint32_t wayland_compositor_name = 0;
+             wl_registry_add_listener(wayland_registry, &WAYLAND_LISTENER, &wayland_compositor_name);
+@@ -830,6 +831,7 @@ bool VulkanCapsViewer::initVulkan()
+                 surfaceCreateInfo.surface = wayland_surface;
+                 surfaceResult = vkCreateWaylandSurfaceKHR(vulkanContext.instance, &surfaceCreateInfo, nullptr, &vulkanContext.surface);
+             }
++            } // if (wayland_display)
+         }
+ #endif
+ #if defined(VK_USE_PLATFORM_XCB_KHR)