2 files changed, 29 insertions, 13 deletions

diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile
index 19af165e9fe2..1a598f909753 100644
--- a/graphics/vulkan-validation-layers/Makefile
+++ b/graphics/vulkan-validation-layers/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	vulkan-validation-layers
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.165
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -10,23 +11,35 @@ COMMENT=	Validation layers for the Vulkan graphics API
 
 LICENSE=	APACHE20
 
-# NOTE: keep spirv-tools and glslang up to date when updating Vulkan
-BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
-		${LOCALBASE}/include/spirv-tools/libspirv.h:graphics/spirv-tools \
-		${LOCALBASE}/include/glslang/SPIRV/spirv.hpp:graphics/glslang
+BUILD_DEPENDS=	glslang>0:graphics/glslang \
+		spirv-tools>0:graphics/spirv-tools \
+		vulkan-headers>0:graphics/vulkan-headers
 
 USES=		cmake compiler:c++11-lib pkgconfig python:3.4+,build
-USE_LDCONFIG=	yes
-
 USE_GITHUB=	yes
+USE_LDCONFIG=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-ValidationLayers
 GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed:headers/external/spirv-headers
-
-# WSI_* in here are leftover from when all of Vulkan SDK was in one repo
-CMAKE_OFF=	BUILD_TESTS ${WAYLAND XCB XLIB:L:C/.*/BUILD_WSI_&_SUPPORT/}
+CMAKE_OFF=	BUILD_TESTS
 CMAKE_ON=	BUILD_LAYER_SUPPORT_FILES
 CMAKE_ARGS=	-DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}" \
 		-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
+
 .include <bsd.port.mk>
diff --git a/graphics/vulkan-validation-layers/pkg-descr b/graphics/vulkan-validation-layers/pkg-descr
index 164b196a815f..2c6bacf8a2e3 100644
--- a/graphics/vulkan-validation-layers/pkg-descr
+++ b/graphics/vulkan-validation-layers/pkg-descr
@@ -1,6 +1,9 @@
-Vulkan is a low-level cross-platform 3D graphics and compute API.
-
-This port provides the official validation layers for Vulkan applications,
-which are useful for development and debugging.
+Vulkan is an Explicit API, enabling direct control over how GPUs
+actually work. By design, minimal error checking is done inside a
+Vulkan driver. Applications have full control and responsibility for
+correct operation. Any errors in how Vulkan is used can result in a
+crash. This project provides Vulkan validation layers that can be
+enabled to assist development by enabling developers to verify their
+applications correct use of the Vulkan API.
 
 WWW: https://github.com/KhronosGroup/Vulkan-ValidationLayers