Attachment #189119 for bug #222175





PORTNAME=	vulkan-sdk
DISTVERSIONPREFIX=	sdk-
DISTVERSION=	1.0.65.1
CATEGORIES=	graphics devel

MAINTAINER=	greg@unrelenting.technology
COMMENT=	Vulkan SDK (headers, driver loader, validation layers)

LICENSE=	APACHE20

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
	${LOCALBASE}/include/spirv-tools/libspirv.h:devel/spirv-tools \
	glslangValidator:devel/glslang


GH_PROJECT=	Vulkan-LoaderAndValidationLayers

CMAKE_ARGS+=	-DBUILD_TESTS:BOOL=OFF \
		-DBUILD_ICD:BOOL=OFF \
		-DCMAKE_SKIP_RPATH:BOOL=ON \
		-DBUILD_WSI_MIR_SUPPORT:BOOL=OFF

OPTIONS_DEFINE=		XLIB XCB WAYLAND DEMOS
OPTIONS_DEFAULT=	XLIB XCB WAYLAND DEMOS
OPTIONS_SUB=		yes

XLIB_DESC=	Build Xlib WSI (Window System Integration) support
XCB_DESC=	Build XCB WSI (Window System Integration) support


XLIB_CMAKE_BOOL=	BUILD_WSI_XLIB_SUPPORT
XLIB_LIB_DEPENDS=	libX11.so:x11/libX11 \
			libXrandr.so:x11/libXrandr
XCB_CMAKE_BOOL=		BUILD_WSI_XCB_SUPPORT
XCB_LIB_DEPENDS=	libX11-xcb.so:x11/libX11 \
			libxcb.so:x11/libxcb
WAYLAND_CMAKE_BOOL=	BUILD_WSI_WAYLAND_SUPPORT
WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
			libwayland-server.so:graphics/wayland \
			libwayland-cursor.so:graphics/wayland \
			libwayland-egl.so:graphics/mesa-libs
DEMOS_CMAKE_BOOL=	BUILD_DEMOS

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)i/graphics/vulkan-sdk/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1504980231	1	TIMESTAMP = 1514238120
2	SHA256 (KhronosGroup-Vulkan-LoaderAndValidationLayers-sdk-1.0.57.0_GH0.tar.gz) = a425caf7cdd4328555de20174e40092aeff491cc511bfc65435fa66dc983461e	2	SHA256 (KhronosGroup-Vulkan-LoaderAndValidationLayers-sdk-1.0.65.1_GH0.tar.gz) = aafb3ae34a653c737e49e48742a9dba6327a83f7f2620434a77184a0b87ffa22
3	SIZE (KhronosGroup-Vulkan-LoaderAndValidationLayers-sdk-1.0.57.0_GH0.tar.gz) = 3851540	3	SIZE (KhronosGroup-Vulkan-LoaderAndValidationLayers-sdk-1.0.65.1_GH0.tar.gz) = 3922245

Added Link Here

(-)i/graphics/vulkan-sdk/files/patch-icd_CMakeLists.txt (+11 lines)
1	--- icd/CMakeLists.txt.orig 2017-12-26 00:43:06.217312000 +0300
2	+++ icd/CMakeLists.txt 2017-12-26 00:43:14.226028000 +0300
3	@@ -4,7 +4,7 @@
4	set(DisplayServer Win32)
5	elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
6	add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR -DVK_USE_PLATFORM_ANDROID_KHX)
7	-elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
8	+elseif(UNIX AND NOT APPLE)
9	if (BUILD_WSI_XCB_SUPPORT)
10	add_definitions(-DVK_USE_PLATFORM_XCB_KHR -DVK_USE_PLATFORM_XCB_KHX)
11	endif()

Lines 8-13 etc/vulkan/explicit_layer.d/VkLayer_threading.json Link Here

(-)i/graphics/vulkan-sdk/pkg-plist (-1 / +2 lines)
8	etc/vulkan/explicit_layer.d/VkLayer_unique_objects.json	8	etc/vulkan/explicit_layer.d/VkLayer_unique_objects.json
9	include/vulkan/vk_icd.h	9	include/vulkan/vk_icd.h
10	include/vulkan/vk_layer.h	10	include/vulkan/vk_layer.h
		11	include/vulkan/vk_layer_dispatch_table.h
11	include/vulkan/vk_platform.h	12	include/vulkan/vk_platform.h
12	include/vulkan/vk_sdk_platform.h	13	include/vulkan/vk_sdk_platform.h
13	include/vulkan/vulkan.h	14	include/vulkan/vulkan.h
Lines 20-24 lib/libVkLayer_unique_objects.so Link Here
20	lib/libVkLayer_utils.so	21	lib/libVkLayer_utils.so
21	lib/libvulkan.so	22	lib/libvulkan.so
22	lib/libvulkan.so.1	23	lib/libvulkan.so.1
23	lib/libvulkan.so.1.0.57	24	lib/libvulkan.so.1.0.65
24	libdata/pkgconfig/vulkan.pc	25	libdata/pkgconfig/vulkan.pc

Return to bug 222175

Lines 2-16 Link Here

(-)i/graphics/vulkan-sdk/Makefile (-14 / +15 lines)
2		2
3	PORTNAME= vulkan-sdk	3	PORTNAME= vulkan-sdk
4	DISTVERSIONPREFIX= sdk-	4	DISTVERSIONPREFIX= sdk-
5	DISTVERSION= 1.0.57.0	5	DISTVERSION= 1.0.65.1
6	CATEGORIES= graphics devel	6	CATEGORIES= graphics devel
7		7
8	MAINTAINER= greg@unrelenting.technology	8	MAINTAINER= greg@unrelenting.technology
9	COMMENT= Vulkan SDK (Headers, ICD Loader, Validation Layers)	9	COMMENT= Vulkan SDK (headers, driver loader, validation layers)
10		10
11	LICENSE= APACHE20	11	LICENSE= APACHE20
12		12
13	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \	13	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
14	${LOCALBASE}/include/spirv-tools/libspirv.h:devel/spirv-tools \	14	${LOCALBASE}/include/spirv-tools/libspirv.h:devel/spirv-tools \
15	glslangValidator:devel/glslang	15	glslangValidator:devel/glslang
16		16
Lines 23-34 GH_ACCOUNT= KhronosGroup Link Here
23	GH_PROJECT= Vulkan-LoaderAndValidationLayers	23	GH_PROJECT= Vulkan-LoaderAndValidationLayers
24		24
25	CMAKE_ARGS+= -DBUILD_TESTS:BOOL=OFF \	25	CMAKE_ARGS+= -DBUILD_TESTS:BOOL=OFF \
26	-DCMAKE_SKIP_RPATH:BOOL=ON \	26	-DBUILD_ICD:BOOL=OFF \
27	-DBUILD_WSI_MIR_SUPPORT:BOOL=OFF	27	-DCMAKE_SKIP_RPATH:BOOL=ON \
		28	-DBUILD_WSI_MIR_SUPPORT:BOOL=OFF
28		29
29	OPTIONS_DEFINE= XLIB XCB WAYLAND DEMOS	30	OPTIONS_DEFINE= XLIB XCB WAYLAND DEMOS
30	OPTIONS_DEFAULT= XLIB XCB DEMOS	31	OPTIONS_DEFAULT= XLIB XCB WAYLAND DEMOS
31	OPTIONS_SUB= yes	32	OPTIONS_SUB= yes
32		33
33	XLIB_DESC= Build Xlib WSI (Window System Integration) support	34	XLIB_DESC= Build Xlib WSI (Window System Integration) support
34	XCB_DESC= Build XCB WSI (Window System Integration) support	35	XCB_DESC= Build XCB WSI (Window System Integration) support
Lines 37-51 DEMOS_DESC= Build demos (including vulkaninfo) Link Here
37		38
38	XLIB_CMAKE_BOOL= BUILD_WSI_XLIB_SUPPORT	39	XLIB_CMAKE_BOOL= BUILD_WSI_XLIB_SUPPORT
39	XLIB_LIB_DEPENDS= libX11.so:x11/libX11 \	40	XLIB_LIB_DEPENDS= libX11.so:x11/libX11 \
40	libXrandr.so:x11/libXrandr	41	libXrandr.so:x11/libXrandr
41	XCB_CMAKE_BOOL= BUILD_WSI_XCB_SUPPORT	42	XCB_CMAKE_BOOL= BUILD_WSI_XCB_SUPPORT
42	XCB_LIB_DEPENDS= libX11-xcb.so:x11/libX11 \	43	XCB_LIB_DEPENDS= libX11-xcb.so:x11/libX11 \
43	libxcb.so:x11/libxcb	44	libxcb.so:x11/libxcb
44	WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT	45	WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT
45	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \	46	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
46	libwayland-server.so:graphics/wayland \	47	libwayland-server.so:graphics/wayland \
47	libwayland-cursor.so:graphics/wayland \	48	libwayland-cursor.so:graphics/wayland \
48	libwayland-egl.so:graphics/mesa-libs	49	libwayland-egl.so:graphics/mesa-libs
49	DEMOS_CMAKE_BOOL= BUILD_DEMOS	50	DEMOS_CMAKE_BOOL= BUILD_DEMOS
50		51
51	.include <bsd.port.mk>	52	.include <bsd.port.mk>