Attachment #195987 for bug #222175




# $FreeBSD$

PORTNAME=	glslang
DISTVERSION=	6.2.2596-248
DISTVERSIONSUFFIX=	-ge0bc65b
CATEGORIES=	devel graphics

MAINTAINER=	greg@unrelenting.technology
COMMENT=	OpenGL and OpenGL ES shader front end and validator

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKDIR}/LICENSE

USES=		cmake:outsource compiler:c++11-lang

USE_GITHUB=	yes
GH_ACCOUNT=	KhronosGroup
GH_PROJECT=	glslang

post-extract:
	${SED} '/^$$/,$$d' ${WRKSRC}/${PORTNAME}/Include/Types.h \
			>${WRKDIR}/LICENSE

.include <bsd.port.mk>

Added Link Here

(-)i/devel/glslang/distinfo (+3 lines)
1	TIMESTAMP = 1533666570
2	SHA256 (KhronosGroup-glslang-6.2.2596-248-ge0bc65b_GH0.tar.gz) = 497a18bfe7e102cda61377ca4fd7dbd84478a89b80e4d53420cf94c9a380f2f0
3	SIZE (KhronosGroup-glslang-6.2.2596-248-ge0bc65b_GH0.tar.gz) = 2353165

Added Link Here

(-)i/devel/glslang/pkg-descr (+5 lines)
1	Glslang is the official reference compiler front end for the OpenGL ES and
2	OpenGL shading languages. It implements a strict interpretation of the
3	specifications for these languages.
4
5	WWW: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/




bin/glslangValidator
bin/spirv-remap
include/SPIRV/GLSL.ext.AMD.h
include/SPIRV/GLSL.ext.EXT.h
include/SPIRV/GLSL.ext.KHR.h
include/SPIRV/GLSL.ext.NV.h
include/SPIRV/GLSL.std.450.h
include/SPIRV/GlslangToSpv.h
include/SPIRV/Logger.h
include/SPIRV/SPVRemapper.h
include/SPIRV/SpvBuilder.h
include/SPIRV/bitutils.h
include/SPIRV/disassemble.h
include/SPIRV/doc.h
include/SPIRV/hex_float.h
include/SPIRV/spirv.hpp
include/SPIRV/spvIR.h
include/glslang/Include/BaseTypes.h
include/glslang/Include/Common.h
include/glslang/Include/ConstantUnion.h
include/glslang/Include/InfoSink.h
include/glslang/Include/InitializeGlobals.h
include/glslang/Include/PoolAlloc.h
include/glslang/Include/ResourceLimits.h
include/glslang/Include/ShHandle.h
include/glslang/Include/Types.h
include/glslang/Include/arrays.h
include/glslang/Include/intermediate.h
include/glslang/Include/revision.h
include/glslang/MachineIndependent/Initialize.h
include/glslang/MachineIndependent/LiveTraverser.h
include/glslang/MachineIndependent/ParseHelper.h
include/glslang/MachineIndependent/RemoveTree.h
include/glslang/MachineIndependent/Scan.h
include/glslang/MachineIndependent/ScanContext.h
include/glslang/MachineIndependent/SymbolTable.h
include/glslang/MachineIndependent/Versions.h
include/glslang/MachineIndependent/attribute.h
include/glslang/MachineIndependent/gl_types.h
include/glslang/MachineIndependent/glslang_tab.cpp.h
include/glslang/MachineIndependent/iomapper.h
include/glslang/MachineIndependent/localintermediate.h
include/glslang/MachineIndependent/parseVersions.h
include/glslang/MachineIndependent/preprocessor/PpContext.h
include/glslang/MachineIndependent/preprocessor/PpTokens.h
include/glslang/MachineIndependent/propagateNoContraction.h
include/glslang/MachineIndependent/reflection.h
include/glslang/Public/ShaderLang.h
lib/libHLSL.a
lib/libOGLCompiler.a
lib/libOSDependent.a
lib/libSPIRV.a
lib/libSPVRemapper.a
lib/libglslang.a




# $FreeBSD$

PORTNAME=	spirv-tools
DISTVERSIONPREFIX=	v
DISTVERSION=	2018.4
CATEGORIES=	devel graphics

MAINTAINER=	greg@unrelenting.technology
COMMENT=	Tools for processing SPIR-V intermediate shader language modules

LICENSE=	APACHE20

USES=		cmake:outsource compiler:c++11-lib python:build shebangfix
SHEBANG_FILES=	tools/lesspipe/spirv-lesspipe.sh

USE_GITHUB=	yes
GH_ACCOUNT=	KhronosGroup
GH_PROJECT=	SPIRV-Tools
GH_TUPLE=	KhronosGroup:SPIRV-Headers:ff684ff:headers/external/spirv-headers

CMAKE_ARGS+=	-DSPIRV_SKIP_TESTS:BOOL=ON \
		-DSPIRV_WERROR:BOOL=OFF

.include <bsd.port.mk>

Added Link Here

(-)i/devel/spirv-tools/distinfo (+5 lines)
1	TIMESTAMP = 1533666224
2	SHA256 (KhronosGroup-SPIRV-Tools-v2018.4_GH0.tar.gz) = e09749d3b9d767cf1cf62ba3cf7d7f992f19681477c434fea214227f3665d8d1
3	SIZE (KhronosGroup-SPIRV-Tools-v2018.4_GH0.tar.gz) = 1327904
4	SHA256 (KhronosGroup-SPIRV-Headers-ff684ff_GH0.tar.gz) = dbeb5b65b290519b026f3eb280107929901d671a7f29ae536885bb72e6c38ebd
5	SIZE (KhronosGroup-SPIRV-Headers-ff684ff_GH0.tar.gz) = 280884

Added Link Here

(-)i/devel/spirv-tools/pkg-descr (+11 lines)
1	The SPIR-V Tools project provides an API and commands for processing SPIR-V
2	modules.
3
4	The project includes an assembler, binary module parser, disassembler,
5	validator, and optimizer for SPIR-V. Except for the optimizer, all are based
6	on a common static library. The library contains all of the implementation
7	details, and is used in the standalone tools whilst also enabling integration
8	into other code bases directly. The optimizer implementation resides in its own
9	library, which depends on the core library.
10
11	WWW: https://github.com/KhronosGroup/SPIRV-Tools




bin/spirv-as
bin/spirv-cfg
bin/spirv-dis
bin/spirv-lesspipe.sh
bin/spirv-link
bin/spirv-opt
bin/spirv-stats
bin/spirv-val
include/spirv-tools/libspirv.h
include/spirv-tools/libspirv.hpp
include/spirv-tools/linker.hpp
include/spirv-tools/optimizer.hpp
lib/libSPIRV-Tools-link.a
lib/libSPIRV-Tools-opt.a
lib/libSPIRV-Tools-shared.so
lib/libSPIRV-Tools.a
libdata/pkgconfig/SPIRV-Tools-shared.pc
libdata/pkgconfig/SPIRV-Tools.pc




# $FreeBSD$

PORTNAME=	vulkan-headers
DISTVERSIONPREFIX=sdk-
DISTVERSION=	1.1.82.0
CATEGORIES=	devel graphics

MAINTAINER=	greg@unrelenting.technology
COMMENT=	Headers for the Vulkan graphics API

LICENSE=	APACHE20

USES=		cmake:outsource
STRIP=		# nothing to strip

USE_GITHUB=	yes
GH_ACCOUNT=	KhronosGroup
GH_PROJECT=	Vulkan-Headers

.include <bsd.port.mk>

Added Link Here

(-)i/devel/vulkan-headers/distinfo (+3 lines)
1	TIMESTAMP = 1533661644
2	SHA256 (KhronosGroup-Vulkan-Headers-sdk-1.1.82.0_GH0.tar.gz) = df73da07d547cfbe88a797802401ea8225e4844e13d4fde52a7cb6e00e5179e5
3	SIZE (KhronosGroup-Vulkan-Headers-sdk-1.1.82.0_GH0.tar.gz) = 472646

Added Link Here

(-)i/devel/vulkan-headers/pkg-descr (+5 lines)
1	Vulkan is a low-level cross-platform 3D graphics and compute API.
2
3	This port provides the development headers for Vulkan applications.
4
5	WWW: https://github.com/KhronosGroup/Vulkan-Headers




include/vulkan/vk_icd.h
include/vulkan/vk_layer.h
include/vulkan/vk_platform.h
include/vulkan/vk_sdk_platform.h
include/vulkan/vulkan.h
include/vulkan/vulkan.hpp
include/vulkan/vulkan_android.h
include/vulkan/vulkan_core.h
include/vulkan/vulkan_ios.h
include/vulkan/vulkan_macos.h
include/vulkan/vulkan_mir.h
include/vulkan/vulkan_vi.h
include/vulkan/vulkan_wayland.h
include/vulkan/vulkan_win32.h
include/vulkan/vulkan_xcb.h
include/vulkan/vulkan_xlib.h
include/vulkan/vulkan_xlib_xrandr.h
share/vulkan/registry/cgenerator.py
share/vulkan/registry/generator.py
share/vulkan/registry/genvk.py
share/vulkan/registry/reg.py
share/vulkan/registry/validusage.json
share/vulkan/registry/vk.xml




# $FreeBSD$

PORTNAME=	vulkan-tools
DISTVERSIONPREFIX=	sdk-
DISTVERSION=	1.1.82.0
CATEGORIES=	devel graphics

MAINTAINER=	greg@unrelenting.technology
COMMENT=	Tools and demos for the Vulkan graphics API

LICENSE=	APACHE20

BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \
	glslangValidator:devel/glslang
LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader \
		libX11-xcb.so:x11/libX11 \
		libXrandr.so:x11/libXrandr \
		libxcb.so:x11/libxcb

USES=	cmake:outsource compiler:c++11-lib python:3.4+,build pkgconfig

USE_GITHUB=	yes
GH_ACCOUNT=	KhronosGroup
GH_PROJECT=	Vulkan-Tools

CMAKE_ARGS+=	-DBUILD_TESTS:BOOL=OFF \
		-DBUILD_ICD:BOOL=OFF \
		-DBUILD_WSI_WAYLAND_SUPPORT:BOOL=OFF \
		-DBUILD_WSI_MIR_SUPPORT:BOOL=OFF \
		-DGLSLANG_INSTALL_DIR=${LOCALBASE}

.include <bsd.port.mk>

Added Link Here

(-)i/devel/vulkan-tools/distinfo (+3 lines)
1	TIMESTAMP = 1533667375
2	SHA256 (KhronosGroup-Vulkan-Tools-sdk-1.1.82.0_GH0.tar.gz) = 22e5e5dfd47535e1664458ee59706abcaace96575d1a3d7fa9ae779a9e83b89c
3	SIZE (KhronosGroup-Vulkan-Tools-sdk-1.1.82.0_GH0.tar.gz) = 342057




--- cube/CMakeLists.txt.orig	2018-08-07 18:44:03 UTC
+++ cube/CMakeLists.txt
@@ -48,7 +48,7 @@ else()
     find_program(GLSLANG_VALIDATOR NAMES ${GLSLANG_VALIDATOR_NAME} HINTS "${PROJECT_SOURCE_DIR}/glslang/bin")
 endif()
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(UNIX AND NOT APPLE)
     include(FindPkgConfig)
     option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
     option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
@@ -58,10 +58,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 
     if(BUILD_WSI_XCB_SUPPORT)
         find_package(XCB REQUIRED)
+        include_directories(SYSTEM ${XCB_INCLUDE_DIR})
     endif()
 
     if(BUILD_WSI_XLIB_SUPPORT)
         find_package(X11 REQUIRED)
+        include_directories(SYSTEM ${X11_Xlib_INCLUDE_PATH})
     endif()
 
     if(BUILD_WSI_WAYLAND_SUPPORT)
@@ -87,7 +89,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     endif()
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
     add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+elseif(UNIX AND NOT APPLE)
     if(NOT CUBE_WSI_SELECTION)
         set(CUBE_WSI_SELECTION "XCB")
     endif()

Added Link Here

(-)i/devel/vulkan-tools/files/patch-cube_cube.cpp (+11 lines)
1	--- cube/cube.cpp.orig 2018-08-07 18:51:55 UTC
2	+++ cube/cube.cpp
3	@@ -2922,7 +2922,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
4	return (int)msg.wParam;
5	}
6
7	-#elif __linux__
8	+#elif __unix__
9
10	int main(int argc, char **argv) {
11	Demo demo;




--- vulkaninfo/CMakeLists.txt.orig	2018-08-07 18:45:41 UTC
+++ vulkaninfo/CMakeLists.txt
@@ -28,7 +28,7 @@ else()
     add_executable(vulkaninfo vulkaninfo.c)
 endif()
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(UNIX AND NOT APPLE)
     include(FindPkgConfig)
     option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
     option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
@@ -36,10 +36,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 
     if(BUILD_WSI_XCB_SUPPORT)
         find_package(XCB REQUIRED)
+        include_directories(SYSTEM ${XCB_INCLUDE_DIR})
     endif()
 
     if(BUILD_WSI_XLIB_SUPPORT)
         find_package(X11 REQUIRED)
+        include_directories(SYSTEM ${X11_Xlib_INCLUDE_PATH})
     endif()
 
     if(VULKANINFO_WSI_SELECTION STREQUAL "XCB")

Added Link Here

(-)i/devel/vulkan-tools/pkg-descr (+5 lines)
1	Vulkan is a low-level cross-platform 3D graphics and compute API.
2
3	This port provides various tools and demos for Vulkan, e.g. vulkaninfo.
4
5	WWW: https://github.com/KhronosGroup/Vulkan-Tools

Added Link Here

(-)i/devel/vulkan-tools/pkg-plist (+3 lines)
1	bin/cube
2	bin/cubepp
3	bin/vulkaninfo




# $FreeBSD$

PORTNAME=	vulkan-validation-layers
DISTVERSIONPREFIX=	sdk-
DISTVERSION=	1.1.82.0
CATEGORIES=	devel graphics

MAINTAINER=	greg@unrelenting.technology
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:devel/vulkan-headers \
	${LOCALBASE}/include/spirv-tools/libspirv.h:devel/spirv-tools \
	${LOCALBASE}/include/SPIRV/spirv.hpp:devel/glslang

USES=	cmake:outsource compiler:c++11-lib python:3.4+,build pkgconfig

USE_GITHUB=	yes
GH_ACCOUNT=	KhronosGroup
GH_PROJECT=	Vulkan-ValidationLayers

# WSI_* in here are leftover from when all of Vulkan SDK was in one repo
CMAKE_ARGS+=	-DBUILD_TESTS:BOOL=OFF \
	-DBUILD_WSI_XCB_SUPPORT:BOOL=OFF \
	-DBUILD_WSI_XLIB_SUPPORT:BOOL=OFF \
	-DBUILD_WSI_WAYLAND_SUPPORT:BOOL=OFF \
	-DBUILD_WSI_MIR_SUPPORT:BOOL=OFF \
	-DGLSLANG_INSTALL_DIR=${LOCALBASE}

.include <bsd.port.mk>

Added Link Here

(-)i/devel/vulkan-validation-layers/distinfo (+3 lines)
1	TIMESTAMP = 1533665599
2	SHA256 (KhronosGroup-Vulkan-ValidationLayers-sdk-1.1.82.0_GH0.tar.gz) = 6d83d1f7085bcfe67a791fce0bfb500dfb5d4833f062db1fc272bdc86e87eded
3	SIZE (KhronosGroup-Vulkan-ValidationLayers-sdk-1.1.82.0_GH0.tar.gz) = 962154




--- CMakeLists.txt.orig	2018-07-30 17:53:08 UTC
+++ CMakeLists.txt
@@ -63,9 +63,9 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 # "Helper" targets that don't have interesting source code should set their FOLDER property to this
 set(LAYERS_HELPER_FOLDER "Helper Targets")
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+if(UNIX)
     set(
-        FALLBACK_CONFIG_DIRS "/etc/xdg"
+        FALLBACK_CONFIG_DIRS "${CMAKE_INSTALL_PREFIX}/etc/xdg:/etc/xdg"
         CACHE
             STRING
             "Search path to use when XDG_CONFIG_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant."
@@ -78,7 +78,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_
         )
 endif()
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(UNIX AND NOT APPLE)
     include(FindPkgConfig)
     option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
     option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)




--- layers/CMakeLists.txt.orig	2018-07-30 17:53:08 UTC
+++ layers/CMakeLists.txt
@@ -23,7 +23,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     set(DisplayServer Win32)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
     add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR -DVK_USE_PLATFORM_ANDROID_KHX)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+elseif(UNIX AND NOT APPLE)
     if(BUILD_WSI_XCB_SUPPORT)
         add_definitions(-DVK_USE_PLATFORM_XCB_KHR -DVK_USE_PLATFORM_XCB_KHX)
     endif()
@@ -131,7 +131,7 @@ if(WIN32)
         add_custom_target(vk_validation_error_messages ALL COMMAND copy ${src_val_msgs} ${dst_val_msgs} VERBATIM)
         set_target_properties(vk_validation_error_messages PROPERTIES FOLDER ${LAYERS_HELPER_FOLDER})
     endif()
-elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+ elseif(UNIX AND NOT APPLE)
     # extra setup for out-of-tree builds
     if(NOT (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR))
         foreach(config_file ${LAYER_JSON_FILES})

Added Link Here

(-)i/devel/vulkan-validation-layers/files/patch-layers_vk__loader__platform.h (+11 lines)
1	--- layers/vk_loader_platform.h.orig 2018-08-07 18:19:43 UTC
2	+++ layers/vk_loader_platform.h
3	@@ -31,7 +31,7 @@
4	#include "vulkan/vk_platform.h"
5	#include "vulkan/vk_sdk_platform.h"
6
7	-#if defined(__linux__) \|\| defined(__APPLE__)
8	+#if defined(__unix__)
9	/* Linux-specific common code: */
10
11	// Headers:

Added Link Here

(-)i/devel/vulkan-validation-layers/pkg-descr (+6 lines)
1	Vulkan is a low-level cross-platform 3D graphics and compute API.
2
3	This port provides the official validation layers for Vulkan applications,
4	which are useful for development and debugging.
5
6	WWW: https://github.com/KhronosGroup/Vulkan-ValidationLayers




include/hash_util.h
include/hash_vk_types.h
include/vk_dispatch_table_helper.h
include/vk_enum_string_helper.h
include/vk_extension_helper.h
include/vk_format_utils.cpp
include/vk_format_utils.h
include/vk_layer_config.cpp
include/vk_layer_config.h
include/vk_layer_data.h
include/vk_layer_dispatch_table.h
include/vk_layer_extension_utils.cpp
include/vk_layer_extension_utils.h
include/vk_layer_logging.h
include/vk_layer_utils.cpp
include/vk_layer_utils.h
include/vk_loader_layer.h
include/vk_loader_platform.h
include/vk_object_types.h
include/vk_safe_struct.cpp
include/vk_safe_struct.h
include/vk_typemap_helper.h
include/vk_validation_error_messages.h
lib/libVkLayer_core_validation.so
lib/libVkLayer_object_tracker.so
lib/libVkLayer_parameter_validation.so
lib/libVkLayer_threading.so
lib/libVkLayer_unique_objects.so
lib/libVkLayer_utils.a
share/vulkan/explicit_layer.d/VkLayer_core_validation.json
share/vulkan/explicit_layer.d/VkLayer_object_tracker.json
share/vulkan/explicit_layer.d/VkLayer_parameter_validation.json
share/vulkan/explicit_layer.d/VkLayer_standard_validation.json
share/vulkan/explicit_layer.d/VkLayer_threading.json
share/vulkan/explicit_layer.d/VkLayer_unique_objects.json

Lines 48-54 LDFLAGS+= -Wl,--as-needed # GLU Link Here

(-)i/emulators/rpcs3/Makefile (-2 / +2 lines)
48		48
49	OPTIONS_DEFINE= ALSA EVDEV GDB LLVM PULSEAUDIO VULKAN	49	OPTIONS_DEFINE= ALSA EVDEV GDB LLVM PULSEAUDIO VULKAN
50	OPTIONS_DEFAULT=ALSA LLVM VULKAN	50	OPTIONS_DEFAULT=ALSA LLVM VULKAN
51	.if !exists(${.CURDIR:H:H}/graphics/vulkan-sdk)	51	.if !exists(${.CURDIR:H:H}/graphics/vulkan-loader)
52	OPTIONS_EXCLUDE=VULKAN # XXX ports/222175	52	OPTIONS_EXCLUDE=VULKAN # XXX ports/222175
53	.endif	53	.endif
54		54
Lines 70-76 PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio Link Here
70	PULSEAUDIO_CMAKE_BOOL= USE_PULSE	70	PULSEAUDIO_CMAKE_BOOL= USE_PULSE
71		71
72	VULKAN_DESC= Vulkan renderer	72	VULKAN_DESC= Vulkan renderer
73	VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-sdk	73	VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader
74	VULKAN_CMAKE_BOOL= USE_VULKAN	74	VULKAN_CMAKE_BOOL= USE_VULKAN
75		75
76	post-patch:	76	post-patch:




# $FreeBSD$

PORTNAME=	vulkan-loader
DISTVERSIONPREFIX=sdk-
DISTVERSION=	1.1.82.0
CATEGORIES=	graphics devel

MAINTAINER=	greg@unrelenting.technology
COMMENT=	Driver loader for the Vulkan graphics API

LICENSE=	APACHE20

BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers

USES=	cmake:outsource compiler:c++11-lib python:3.4+,build pkgconfig

USE_LDCONFIG=	yes

USE_GITHUB=	yes
GH_ACCOUNT=	KhronosGroup
GH_PROJECT=	Vulkan-Loader

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

OPTIONS_DEFINE=		XLIB XCB WAYLAND
OPTIONS_DEFAULT=	XLIB XCB WAYLAND

XLIB_DESC=	Build Xlib WSI (Window System Integration) support
XCB_DESC=	Build XCB WSI (Window System Integration) support
WAYLAND_DESC=	Build Wayland 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-egl.so:graphics/wayland

.include <bsd.port.mk>

Added Link Here

(-)i/graphics/vulkan-loader/distinfo (+3 lines)
1	TIMESTAMP = 1533664679
2	SHA256 (KhronosGroup-Vulkan-Loader-sdk-1.1.82.0_GH0.tar.gz) = 86cd3e93d99cbfbb8550e7f2137cacfdaf9aa6611b814e054b2156b4b4775b0c
3	SIZE (KhronosGroup-Vulkan-Loader-sdk-1.1.82.0_GH0.tar.gz) = 1341774




--- CMakeLists.txt.orig	2018-08-04 01:10:42.000000000 +0300
+++ CMakeLists.txt	2018-08-07 21:00:06.045029000 +0300
@@ -57,9 +57,9 @@
 # "Helper" targets that don't have interesting source code should set their FOLDER property to this
 set(LOADER_HELPER_FOLDER "Helper Targets")
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+if(UNIX AND NOT APPLE)
     set(
-        FALLBACK_CONFIG_DIRS "/etc/xdg"
+        FALLBACK_CONFIG_DIRS "${CMAKE_INSTALL_PREFIX}/etc/xdg:/etc/xdg"
         CACHE
             STRING
             "Search path to use when XDG_CONFIG_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant."
@@ -72,7 +72,7 @@
         )
 endif()
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(UNIX AND NOT APPLE)
     include(FindPkgConfig)
     option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
     option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
@@ -81,10 +81,12 @@
 
     if(BUILD_WSI_XCB_SUPPORT)
         find_package(XCB REQUIRED)
+        include_directories(SYSTEM ${XCB_INCLUDE_DIR})
     endif()
 
     if(BUILD_WSI_XLIB_SUPPORT)
         find_package(X11 REQUIRED)
+        include_directories(SYSTEM ${X11_Xlib_INCLUDE_PATH})
     endif()
 
     if(BUILD_WSI_WAYLAND_SUPPORT)




--- loader/CMakeLists.txt.orig	2018-08-04 01:10:42.000000000 +0300
+++ loader/CMakeLists.txt	2018-08-07 21:01:27.748868000 +0300
@@ -40,7 +40,7 @@
     endif()
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
     add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+elseif(UNIX AND NOT APPLE)
     if(BUILD_WSI_XCB_SUPPORT)
         add_definitions(-DVK_USE_PLATFORM_XCB_KHR)
     endif()
@@ -223,7 +223,7 @@
     add_dependencies(vulkan generate_helper_files loader_gen_files loader_asm_gen_files)
     target_compile_definitions(vulkan PUBLIC -DLOADER_DYNAMIC_LIB)
     set_target_properties(vulkan PROPERTIES SOVERSION "1" VERSION "${VulkanHeaders_VERSION_MAJOR}.${VulkanHeaders_VERSION_MINOR}.${VulkanHeaders_VERSION_PATCH}")
-    target_link_libraries(vulkan -ldl -lpthread -lm)
+    target_link_libraries(vulkan ${CMAKE_DL_LIBS} -lpthread -lm)
 
     if(APPLE)
         find_library(COREFOUNDATION_LIBRARY NAMES CoreFoundation)




--- loader/loader.c.orig	2018-08-04 01:10:42.000000000 +0300
+++ loader/loader.c	2018-08-07 21:03:04.814975000 +0300
@@ -215,7 +215,7 @@
 }
 
 // Environment variables
-#if defined(__linux__) || defined(__APPLE__)
+#if defined(__unix__)
 
 static inline char *loader_getenv(const char *name, const struct loader_instance *inst) {
     // No allocation of memory necessary for Linux, but we should at least touch
@@ -225,7 +225,7 @@
 }
 
 static inline char *loader_secure_getenv(const char *name, const struct loader_instance *inst) {
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__FreeBSD__)
     // Apple does not appear to have a secure getenv implementation.
     // The main difference between secure getenv and getenv is that secure getenv
     // returns NULL if the process is being run with elevated privileges by a normal user.

Added Link Here

(-)i/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h (+11 lines)
1	--- loader/vk_loader_platform.h.orig 2018-08-07 21:04:13.856591000 +0300
2	+++ loader/vk_loader_platform.h 2018-08-07 21:04:14.881279000 +0300
3	@@ -31,7 +31,7 @@
4	#include "vulkan/vk_platform.h"
5	#include "vulkan/vk_sdk_platform.h"
6
7	-#if defined(__linux__) \|\| defined(__APPLE__)
8	+#if defined(__unix__)
9	/* Linux-specific common code: */
10
11	// Headers:

Added Link Here

(-)i/graphics/vulkan-loader/pkg-descr (+6 lines)
1	Vulkan is a low-level cross-platform 3D graphics and compute API.
2
3	This port provides the Khronos official ICD (Installable Client Driver) loader,
4	which is necessary for loading Vulkan drivers in a running application.
5
6	WWW: https://github.com/KhronosGroup/Vulkan-Loader

Added Link Here

(-)i/graphics/vulkan-loader/pkg-plist (+4 lines)
1	lib/libvulkan.so
2	lib/libvulkan.so.1
3	lib/libvulkan.so.1.1.82
4	libdata/pkgconfig/vulkan.pc

Return to bug 222175

Added Link Here

(-)i/devel/glslang/Makefile (+24 lines)
1	# $FreeBSD$
2
3	PORTNAME= glslang
4	DISTVERSION= 6.2.2596-248
5	DISTVERSIONSUFFIX= -ge0bc65b
6	CATEGORIES= devel graphics
7
8	MAINTAINER= greg@unrelenting.technology
9	COMMENT= OpenGL and OpenGL ES shader front end and validator
10
11	LICENSE= BSD3CLAUSE
12	LICENSE_FILE= ${WRKDIR}/LICENSE
13
14	USES= cmake:outsource compiler:c++11-lang
15
16	USE_GITHUB= yes
17	GH_ACCOUNT= KhronosGroup
18	GH_PROJECT= glslang
19
20	post-extract:
21	${SED} '/^$$/,$$d' ${WRKSRC}/${PORTNAME}/Include/Types.h \
22	>${WRKDIR}/LICENSE
23
24	.include <bsd.port.mk>

Added Link Here

(-)i/devel/glslang/pkg-plist (+54 lines)
1	bin/glslangValidator
2	bin/spirv-remap
3	include/SPIRV/GLSL.ext.AMD.h
4	include/SPIRV/GLSL.ext.EXT.h
5	include/SPIRV/GLSL.ext.KHR.h
6	include/SPIRV/GLSL.ext.NV.h
7	include/SPIRV/GLSL.std.450.h
8	include/SPIRV/GlslangToSpv.h
9	include/SPIRV/Logger.h
10	include/SPIRV/SPVRemapper.h
11	include/SPIRV/SpvBuilder.h
12	include/SPIRV/bitutils.h
13	include/SPIRV/disassemble.h
14	include/SPIRV/doc.h
15	include/SPIRV/hex_float.h
16	include/SPIRV/spirv.hpp
17	include/SPIRV/spvIR.h
18	include/glslang/Include/BaseTypes.h
19	include/glslang/Include/Common.h
20	include/glslang/Include/ConstantUnion.h
21	include/glslang/Include/InfoSink.h
22	include/glslang/Include/InitializeGlobals.h
23	include/glslang/Include/PoolAlloc.h
24	include/glslang/Include/ResourceLimits.h
25	include/glslang/Include/ShHandle.h
26	include/glslang/Include/Types.h
27	include/glslang/Include/arrays.h
28	include/glslang/Include/intermediate.h
29	include/glslang/Include/revision.h
30	include/glslang/MachineIndependent/Initialize.h
31	include/glslang/MachineIndependent/LiveTraverser.h
32	include/glslang/MachineIndependent/ParseHelper.h
33	include/glslang/MachineIndependent/RemoveTree.h
34	include/glslang/MachineIndependent/Scan.h
35	include/glslang/MachineIndependent/ScanContext.h
36	include/glslang/MachineIndependent/SymbolTable.h
37	include/glslang/MachineIndependent/Versions.h
38	include/glslang/MachineIndependent/attribute.h
39	include/glslang/MachineIndependent/gl_types.h
40	include/glslang/MachineIndependent/glslang_tab.cpp.h
41	include/glslang/MachineIndependent/iomapper.h
42	include/glslang/MachineIndependent/localintermediate.h
43	include/glslang/MachineIndependent/parseVersions.h
44	include/glslang/MachineIndependent/preprocessor/PpContext.h
45	include/glslang/MachineIndependent/preprocessor/PpTokens.h
46	include/glslang/MachineIndependent/propagateNoContraction.h
47	include/glslang/MachineIndependent/reflection.h
48	include/glslang/Public/ShaderLang.h
49	lib/libHLSL.a
50	lib/libOGLCompiler.a
51	lib/libOSDependent.a
52	lib/libSPIRV.a
53	lib/libSPVRemapper.a
54	lib/libglslang.a

Added Link Here

(-)i/devel/spirv-tools/Makefile (+24 lines)
1	# $FreeBSD$
2
3	PORTNAME= spirv-tools
4	DISTVERSIONPREFIX= v
5	DISTVERSION= 2018.4
6	CATEGORIES= devel graphics
7
8	MAINTAINER= greg@unrelenting.technology
9	COMMENT= Tools for processing SPIR-V intermediate shader language modules
10
11	LICENSE= APACHE20
12
13	USES= cmake:outsource compiler:c++11-lib python:build shebangfix
14	SHEBANG_FILES= tools/lesspipe/spirv-lesspipe.sh
15
16	USE_GITHUB= yes
17	GH_ACCOUNT= KhronosGroup
18	GH_PROJECT= SPIRV-Tools
19	GH_TUPLE= KhronosGroup:SPIRV-Headers:ff684ff:headers/external/spirv-headers
20
21	CMAKE_ARGS+= -DSPIRV_SKIP_TESTS:BOOL=ON \
22	-DSPIRV_WERROR:BOOL=OFF
23
24	.include <bsd.port.mk>

Added Link Here

(-)i/devel/spirv-tools/pkg-plist (+18 lines)
1	bin/spirv-as
2	bin/spirv-cfg
3	bin/spirv-dis
4	bin/spirv-lesspipe.sh
5	bin/spirv-link
6	bin/spirv-opt
7	bin/spirv-stats
8	bin/spirv-val
9	include/spirv-tools/libspirv.h
10	include/spirv-tools/libspirv.hpp
11	include/spirv-tools/linker.hpp
12	include/spirv-tools/optimizer.hpp
13	lib/libSPIRV-Tools-link.a
14	lib/libSPIRV-Tools-opt.a
15	lib/libSPIRV-Tools-shared.so
16	lib/libSPIRV-Tools.a
17	libdata/pkgconfig/SPIRV-Tools-shared.pc
18	libdata/pkgconfig/SPIRV-Tools.pc

Added Link Here

(-)i/devel/vulkan-headers/Makefile (+20 lines)
1	# $FreeBSD$
2
3	PORTNAME= vulkan-headers
4	DISTVERSIONPREFIX=sdk-
5	DISTVERSION= 1.1.82.0
6	CATEGORIES= devel graphics
7
8	MAINTAINER= greg@unrelenting.technology
9	COMMENT= Headers for the Vulkan graphics API
10
11	LICENSE= APACHE20
12
13	USES= cmake:outsource
14	STRIP= # nothing to strip
15
16	USE_GITHUB= yes
17	GH_ACCOUNT= KhronosGroup
18	GH_PROJECT= Vulkan-Headers
19
20	.include <bsd.port.mk>

Added Link Here

(-)i/devel/vulkan-headers/pkg-plist (+23 lines)
1	include/vulkan/vk_icd.h
2	include/vulkan/vk_layer.h
3	include/vulkan/vk_platform.h
4	include/vulkan/vk_sdk_platform.h
5	include/vulkan/vulkan.h
6	include/vulkan/vulkan.hpp
7	include/vulkan/vulkan_android.h
8	include/vulkan/vulkan_core.h
9	include/vulkan/vulkan_ios.h
10	include/vulkan/vulkan_macos.h
11	include/vulkan/vulkan_mir.h
12	include/vulkan/vulkan_vi.h
13	include/vulkan/vulkan_wayland.h
14	include/vulkan/vulkan_win32.h
15	include/vulkan/vulkan_xcb.h
16	include/vulkan/vulkan_xlib.h
17	include/vulkan/vulkan_xlib_xrandr.h
18	share/vulkan/registry/cgenerator.py
19	share/vulkan/registry/generator.py
20	share/vulkan/registry/genvk.py
21	share/vulkan/registry/reg.py
22	share/vulkan/registry/validusage.json
23	share/vulkan/registry/vk.xml

Added Link Here

(-)i/devel/vulkan-tools/Makefile (+32 lines)
1	# $FreeBSD$
2
3	PORTNAME= vulkan-tools
4	DISTVERSIONPREFIX= sdk-
5	DISTVERSION= 1.1.82.0
6	CATEGORIES= devel graphics
7
8	MAINTAINER= greg@unrelenting.technology
9	COMMENT= Tools and demos for the Vulkan graphics API
10
11	LICENSE= APACHE20
12
13	BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \
14	glslangValidator:devel/glslang
15	LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader \
16	libX11-xcb.so:x11/libX11 \
17	libXrandr.so:x11/libXrandr \
18	libxcb.so:x11/libxcb
19
20	USES= cmake:outsource compiler:c++11-lib python:3.4+,build pkgconfig
21
22	USE_GITHUB= yes
23	GH_ACCOUNT= KhronosGroup
24	GH_PROJECT= Vulkan-Tools
25
26	CMAKE_ARGS+= -DBUILD_TESTS:BOOL=OFF \
27	-DBUILD_ICD:BOOL=OFF \
28	-DBUILD_WSI_WAYLAND_SUPPORT:BOOL=OFF \
29	-DBUILD_WSI_MIR_SUPPORT:BOOL=OFF \
30	-DGLSLANG_INSTALL_DIR=${LOCALBASE}
31
32	.include <bsd.port.mk>

Added Link Here

(-)i/devel/vulkan-tools/files/patch-cube_CMakeLists.txt (+33 lines)
1	--- cube/CMakeLists.txt.orig 2018-08-07 18:44:03 UTC
2	+++ cube/CMakeLists.txt
3	@@ -48,7 +48,7 @@ else()
4	find_program(GLSLANG_VALIDATOR NAMES ${GLSLANG_VALIDATOR_NAME} HINTS "${PROJECT_SOURCE_DIR}/glslang/bin")
5	endif()
6
7	-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
8	+if(UNIX AND NOT APPLE)
9	include(FindPkgConfig)
10	option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
11	option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
12	@@ -58,10 +58,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
13
14	if(BUILD_WSI_XCB_SUPPORT)
15	find_package(XCB REQUIRED)
16	+ include_directories(SYSTEM ${XCB_INCLUDE_DIR})
17	endif()
18
19	if(BUILD_WSI_XLIB_SUPPORT)
20	find_package(X11 REQUIRED)
21	+ include_directories(SYSTEM ${X11_Xlib_INCLUDE_PATH})
22	endif()
23
24	if(BUILD_WSI_WAYLAND_SUPPORT)
25	@@ -87,7 +89,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
26	endif()
27	elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
28	add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR)
29	-elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
30	+elseif(UNIX AND NOT APPLE)
31	if(NOT CUBE_WSI_SELECTION)
32	set(CUBE_WSI_SELECTION "XCB")
33	endif()

Added Link Here

(-)i/devel/vulkan-tools/files/patch-vulkaninfo_CMakeLists.txt (+24 lines)
1	--- vulkaninfo/CMakeLists.txt.orig 2018-08-07 18:45:41 UTC
2	+++ vulkaninfo/CMakeLists.txt
3	@@ -28,7 +28,7 @@ else()
4	add_executable(vulkaninfo vulkaninfo.c)
5	endif()
6
7	-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
8	+if(UNIX AND NOT APPLE)
9	include(FindPkgConfig)
10	option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
11	option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
12	@@ -36,10 +36,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
13
14	if(BUILD_WSI_XCB_SUPPORT)
15	find_package(XCB REQUIRED)
16	+ include_directories(SYSTEM ${XCB_INCLUDE_DIR})
17	endif()
18
19	if(BUILD_WSI_XLIB_SUPPORT)
20	find_package(X11 REQUIRED)
21	+ include_directories(SYSTEM ${X11_Xlib_INCLUDE_PATH})
22	endif()
23
24	if(VULKANINFO_WSI_SELECTION STREQUAL "XCB")

Added Link Here

(-)i/devel/vulkan-validation-layers/Makefile (+32 lines)
1	# $FreeBSD$
2
3	PORTNAME= vulkan-validation-layers
4	DISTVERSIONPREFIX= sdk-
5	DISTVERSION= 1.1.82.0
6	CATEGORIES= devel graphics
7
8	MAINTAINER= greg@unrelenting.technology
9	COMMENT= Validation layers for the Vulkan graphics API
10
11	LICENSE= APACHE20
12
13	# NOTE: keep spirv-tools and glslang up to date when updating Vulkan
14	BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \
15	${LOCALBASE}/include/spirv-tools/libspirv.h:devel/spirv-tools \
16	${LOCALBASE}/include/SPIRV/spirv.hpp:devel/glslang
17
18	USES= cmake:outsource compiler:c++11-lib python:3.4+,build pkgconfig
19
20	USE_GITHUB= yes
21	GH_ACCOUNT= KhronosGroup
22	GH_PROJECT= Vulkan-ValidationLayers
23
24	# WSI_* in here are leftover from when all of Vulkan SDK was in one repo
25	CMAKE_ARGS+= -DBUILD_TESTS:BOOL=OFF \
26	-DBUILD_WSI_XCB_SUPPORT:BOOL=OFF \
27	-DBUILD_WSI_XLIB_SUPPORT:BOOL=OFF \
28	-DBUILD_WSI_WAYLAND_SUPPORT:BOOL=OFF \
29	-DBUILD_WSI_MIR_SUPPORT:BOOL=OFF \
30	-DGLSLANG_INSTALL_DIR=${LOCALBASE}
31
32	.include <bsd.port.mk>

Added Link Here

(-)i/devel/vulkan-validation-layers/files/patch-CMakeLists.txt (+23 lines)
1	--- CMakeLists.txt.orig 2018-07-30 17:53:08 UTC
2	+++ CMakeLists.txt
3	@@ -63,9 +63,9 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
4	# "Helper" targets that don't have interesting source code should set their FOLDER property to this
5	set(LAYERS_HELPER_FOLDER "Helper Targets")
6
7	-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
8	+if(UNIX)
9	set(
10	- FALLBACK_CONFIG_DIRS "/etc/xdg"
11	+ FALLBACK_CONFIG_DIRS "${CMAKE_INSTALL_PREFIX}/etc/xdg:/etc/xdg"
12	CACHE
13	STRING
14	"Search path to use when XDG_CONFIG_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant."
15	@@ -78,7 +78,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_
16	)
17	endif()
18
19	-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
20	+if(UNIX AND NOT APPLE)
21	include(FindPkgConfig)
22	option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
23	option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)

Added Link Here

(-)i/devel/vulkan-validation-layers/files/patch-layers_CMakeLists.txt (+20 lines)
1	--- layers/CMakeLists.txt.orig 2018-07-30 17:53:08 UTC
2	+++ layers/CMakeLists.txt
3	@@ -23,7 +23,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
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()
12	@@ -131,7 +131,7 @@ if(WIN32)
13	add_custom_target(vk_validation_error_messages ALL COMMAND copy ${src_val_msgs} ${dst_val_msgs} VERBATIM)
14	set_target_properties(vk_validation_error_messages PROPERTIES FOLDER ${LAYERS_HELPER_FOLDER})
15	endif()
16	-elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
17	+ elseif(UNIX AND NOT APPLE)
18	# extra setup for out-of-tree builds
19	if(NOT (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR))
20	foreach(config_file ${LAYER_JSON_FILES})

Added Link Here

(-)i/devel/vulkan-validation-layers/pkg-plist (+35 lines)
1	include/hash_util.h
2	include/hash_vk_types.h
3	include/vk_dispatch_table_helper.h
4	include/vk_enum_string_helper.h
5	include/vk_extension_helper.h
6	include/vk_format_utils.cpp
7	include/vk_format_utils.h
8	include/vk_layer_config.cpp
9	include/vk_layer_config.h
10	include/vk_layer_data.h
11	include/vk_layer_dispatch_table.h
12	include/vk_layer_extension_utils.cpp
13	include/vk_layer_extension_utils.h
14	include/vk_layer_logging.h
15	include/vk_layer_utils.cpp
16	include/vk_layer_utils.h
17	include/vk_loader_layer.h
18	include/vk_loader_platform.h
19	include/vk_object_types.h
20	include/vk_safe_struct.cpp
21	include/vk_safe_struct.h
22	include/vk_typemap_helper.h
23	include/vk_validation_error_messages.h
24	lib/libVkLayer_core_validation.so
25	lib/libVkLayer_object_tracker.so
26	lib/libVkLayer_parameter_validation.so
27	lib/libVkLayer_threading.so
28	lib/libVkLayer_unique_objects.so
29	lib/libVkLayer_utils.a
30	share/vulkan/explicit_layer.d/VkLayer_core_validation.json
31	share/vulkan/explicit_layer.d/VkLayer_object_tracker.json
32	share/vulkan/explicit_layer.d/VkLayer_parameter_validation.json
33	share/vulkan/explicit_layer.d/VkLayer_standard_validation.json
34	share/vulkan/explicit_layer.d/VkLayer_threading.json
35	share/vulkan/explicit_layer.d/VkLayer_unique_objects.json

Added Link Here

(-)i/graphics/vulkan-loader/Makefile (+43 lines)
1	# $FreeBSD$
2
3	PORTNAME= vulkan-loader
4	DISTVERSIONPREFIX=sdk-
5	DISTVERSION= 1.1.82.0
6	CATEGORIES= graphics devel
7
8	MAINTAINER= greg@unrelenting.technology
9	COMMENT= Driver loader for the Vulkan graphics API
10
11	LICENSE= APACHE20
12
13	BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
14
15	USES= cmake:outsource compiler:c++11-lib python:3.4+,build pkgconfig
16
17	USE_LDCONFIG= yes
18
19	USE_GITHUB= yes
20	GH_ACCOUNT= KhronosGroup
21	GH_PROJECT= Vulkan-Loader
22
23	CMAKE_ARGS+= -DBUILD_TESTS:BOOL=OFF \
24	-DCMAKE_SKIP_RPATH:BOOL=ON \
25	-DBUILD_WSI_MIR_SUPPORT:BOOL=OFF
26
27	OPTIONS_DEFINE= XLIB XCB WAYLAND
28	OPTIONS_DEFAULT= XLIB XCB WAYLAND
29
30	XLIB_DESC= Build Xlib WSI (Window System Integration) support
31	XCB_DESC= Build XCB WSI (Window System Integration) support
32	WAYLAND_DESC= Build Wayland WSI (Window System Integration) support
33
34	XLIB_CMAKE_BOOL= BUILD_WSI_XLIB_SUPPORT
35	XLIB_LIB_DEPENDS= libX11.so:x11/libX11 \
36	libXrandr.so:x11/libXrandr
37	XCB_CMAKE_BOOL= BUILD_WSI_XCB_SUPPORT
38	XCB_LIB_DEPENDS= libX11-xcb.so:x11/libX11 \
39	libxcb.so:x11/libxcb
40	WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT
41	WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland
42
43	.include <bsd.port.mk>

Added Link Here

(-)i/graphics/vulkan-loader/files/patch-CMakeLists.txt (+36 lines)
1	--- CMakeLists.txt.orig 2018-08-04 01:10:42.000000000 +0300
2	+++ CMakeLists.txt 2018-08-07 21:00:06.045029000 +0300
3	@@ -57,9 +57,9 @@
4	# "Helper" targets that don't have interesting source code should set their FOLDER property to this
5	set(LOADER_HELPER_FOLDER "Helper Targets")
6
7	-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
8	+if(UNIX AND NOT APPLE)
9	set(
10	- FALLBACK_CONFIG_DIRS "/etc/xdg"
11	+ FALLBACK_CONFIG_DIRS "${CMAKE_INSTALL_PREFIX}/etc/xdg:/etc/xdg"
12	CACHE
13	STRING
14	"Search path to use when XDG_CONFIG_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant."
15	@@ -72,7 +72,7 @@
16	)
17	endif()
18
19	-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
20	+if(UNIX AND NOT APPLE)
21	include(FindPkgConfig)
22	option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
23	option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
24	@@ -81,10 +81,12 @@
25
26	if(BUILD_WSI_XCB_SUPPORT)
27	find_package(XCB REQUIRED)
28	+ include_directories(SYSTEM ${XCB_INCLUDE_DIR})
29	endif()
30
31	if(BUILD_WSI_XLIB_SUPPORT)
32	find_package(X11 REQUIRED)
33	+ include_directories(SYSTEM ${X11_Xlib_INCLUDE_PATH})
34	endif()
35
36	if(BUILD_WSI_WAYLAND_SUPPORT)

Added Link Here

(-)i/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt (+20 lines)
1	--- loader/CMakeLists.txt.orig 2018-08-04 01:10:42.000000000 +0300
2	+++ loader/CMakeLists.txt 2018-08-07 21:01:27.748868000 +0300
3	@@ -40,7 +40,7 @@
4	endif()
5	elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
6	add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR)
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)
11	endif()
12	@@ -223,7 +223,7 @@
13	add_dependencies(vulkan generate_helper_files loader_gen_files loader_asm_gen_files)
14	target_compile_definitions(vulkan PUBLIC -DLOADER_DYNAMIC_LIB)
15	set_target_properties(vulkan PROPERTIES SOVERSION "1" VERSION "${VulkanHeaders_VERSION_MAJOR}.${VulkanHeaders_VERSION_MINOR}.${VulkanHeaders_VERSION_PATCH}")
16	- target_link_libraries(vulkan -ldl -lpthread -lm)
17	+ target_link_libraries(vulkan ${CMAKE_DL_LIBS} -lpthread -lm)
18
19	if(APPLE)
20	find_library(COREFOUNDATION_LIBRARY NAMES CoreFoundation)

Added Link Here

(-)i/graphics/vulkan-loader/files/patch-loader_loader.c (+20 lines)
1	--- loader/loader.c.orig 2018-08-04 01:10:42.000000000 +0300
2	+++ loader/loader.c 2018-08-07 21:03:04.814975000 +0300
3	@@ -215,7 +215,7 @@
4	}
5
6	// Environment variables
7	-#if defined(__linux__) \|\| defined(__APPLE__)
8	+#if defined(__unix__)
9
10	static inline char loader_getenv(const char name, const struct loader_instance *inst) {
11	// No allocation of memory necessary for Linux, but we should at least touch
12	@@ -225,7 +225,7 @@
13	}
14
15	static inline char loader_secure_getenv(const char name, const struct loader_instance *inst) {
16	-#if defined(__APPLE__)
17	+#if defined(__APPLE__) \|\| defined(__FreeBSD__)
18	// Apple does not appear to have a secure getenv implementation.
19	// The main difference between secure getenv and getenv is that secure getenv
20	// returns NULL if the process is being run with elevated privileges by a normal user.