Attachment #191036 for bug #222175




# $FreeBSD$

PORTNAME=	glslang
DISTVERSION=	2.3-1838
DISTVERSIONSUFFIX=	-g2651ccaec8
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 = 1519685681
2	SHA256 (KhronosGroup-glslang-2.3-1838-g2651ccaec8_GH0.tar.gz) = 343e5541a716074e57b9264362c53077d12b3eca78ecadac3315522b57e6f2bd
3	SIZE (KhronosGroup-glslang-2.3-1838-g2651ccaec8_GH0.tar.gz) = 1986074

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.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.0-6
DISTVERSIONSUFFIX=	-g9e19fc0
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:ce309203d: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 = 1519686387
2	SHA256 (KhronosGroup-SPIRV-Tools-v2018.0-6-g9e19fc0_GH0.tar.gz) = 54892d2a47a68179a9e51f9d648302db6ef77e11bc909acef37097d7823d6827
3	SIZE (KhronosGroup-SPIRV-Tools-v2018.0-6-g9e19fc0_GH0.tar.gz) = 955907
4	SHA256 (KhronosGroup-SPIRV-Headers-ce309203d_GH0.tar.gz) = f07b35c2e63dd0c8bcbb7fb50185e79a2a067ac1878dc49353196a688b025583
5	SIZE (KhronosGroup-SPIRV-Headers-ce309203d_GH0.tar.gz) = 269780

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.a
libdata/pkgconfig/SPIRV-Tools.pc




# $FreeBSD$

PORTNAME=	vulkan-sdk
DISTVERSIONPREFIX=	sdk-
DISTVERSION=	1.0.68.0
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

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

USE_LDCONFIG=	yes

USE_GITHUB=	yes
GH_ACCOUNT=	KhronosGroup
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
WAYLAND_DESC=	Build Wayland WSI (Window System Integration) support
DEMOS_DESC=	Build demos (including vulkaninfo)

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>

Added Link Here

(-)i/graphics/vulkan-sdk/distinfo (+3 lines)
1	TIMESTAMP = 1519684412
2	SHA256 (KhronosGroup-Vulkan-LoaderAndValidationLayers-sdk-1.0.68.0_GH0.tar.gz) = d046cf7c69338c7217b70f19bed6844865aaac36205607c63891dffe8bcfafd8
3	SIZE (KhronosGroup-Vulkan-LoaderAndValidationLayers-sdk-1.0.68.0_GH0.tar.gz) = 4029972




--- CMakeLists.txt.orig	2018-02-08 21:01:02.000000000 +0300
+++ CMakeLists.txt	2018-02-27 02:24:21.988361000 +0300
@@ -28,8 +28,8 @@
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set(LVL_TARGET_FOLDER lvl_cmake_targets)
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    set(FALLBACK_CONFIG_DIRS "/etc/xdg" CACHE STRING
+if(UNIX AND NOT APPLE)
+    set(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.")
     set(FALLBACK_DATA_DIRS "/usr/local/share:/usr/share" CACHE STRING
         "Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant.")
@@ -43,10 +43,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)
@@ -357,7 +359,14 @@
 run_vk_xml_generate(helper_file_generator.py vk_object_types.h)
 run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h)
 run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h)
-run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
+file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/spirv_tools_commit_id.h "
+#pragma once
+#define SPIRV_TOOLS_COMMIT_ID \"9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8\"
+")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/spirv_tools_commit_id.h "
+#pragma once
+#define SPIRV_TOOLS_COMMIT_ID \"9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8\"
+")
 
 
 

Added Link Here

(-)i/graphics/vulkan-sdk/files/patch-demos_CMakeLists.txt (+11 lines)
1	--- demos/CMakeLists.txt.orig 2017-08-10 15:50:41 UTC
2	+++ demos/CMakeLists.txt
3	@@ -3,7 +3,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)
7	-elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
8	+elseif(UNIX AND NOT APPLE)
9	if (NOT DEMOS_WSI_SELECTION)
10	set(DEMOS_WSI_SELECTION "XCB")
11	endif()

Added Link Here

(-)i/graphics/vulkan-sdk/files/patch-demos_cube.cpp (+11 lines)
1	--- demos/cube.cpp.orig 2017-08-10 15:50:41 UTC
2	+++ demos/cube.cpp
3	@@ -2948,7 +2948,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
4	return (int)msg.wParam;
5	}
6
7	-#elif __linux__
8	+#elif defined(__unix__)
9
10	int main(int argc, char **argv) {
11	Demo demo;




--- demos/smoke/CMakeLists.txt.orig	2017-08-10 15:50:41 UTC
+++ demos/smoke/CMakeLists.txt
@@ -61,7 +61,10 @@ if(WIN32)
 
     list(APPEND sources ShellWin32.cpp ShellWin32.h)
 else()
-    list(APPEND libraries PRIVATE -ldl -lrt)
+    if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$")
+        list(APPEND libraries PRIVATE -lrt)
+    endif()
+    list(APPEND libraries PRIVATE ${CMAKE_DL_LIBS})
 
     if(BUILD_WSI_XCB_SUPPORT AND DEMOS_WSI_SELECTION STREQUAL "XCB")
         find_package(XCB REQUIRED)

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()

Added Link Here

(-)i/graphics/vulkan-sdk/files/patch-layers_CMakeLists.txt (+11 lines)
1	--- layers/CMakeLists.txt.orig 2017-08-10 15:50:41 UTC
2	+++ layers/CMakeLists.txt
3	@@ -4,7 +4,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()




--- loader/CMakeLists.txt.orig	2017-08-10 15:50:41 UTC
+++ loader/CMakeLists.txt
@@ -25,7 +25,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     set(DisplayServer Win32)
 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()
@@ -186,7 +186,7 @@ else()
     add_library(${API_LOWERCASE} SHARED ${NORMAL_LOADER_SRCS} ${OPT_LOADER_SRCS})
     add_dependencies(${API_LOWERCASE} generate_helper_files loader_gen_files loader_asm_gen_files)
     set_target_properties(${API_LOWERCASE} PROPERTIES SOVERSION "1" VERSION "1.0.${vk_header_version}")
-    target_link_libraries(${API_LOWERCASE} -ldl -lpthread -lm)
+    target_link_libraries(${API_LOWERCASE} -lpthread -lm ${CMAKE_DL_LIBS})
 
     if(INSTALL_LVL_FILES)
         install(TARGETS ${API_LOWERCASE} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

Added Link Here

(-)i/graphics/vulkan-sdk/files/patch-loader_loader.c (+11 lines)
1	--- loader/loader.c.orig 2017-08-10 15:50:41 UTC
2	+++ loader/loader.c
3	@@ -204,7 +204,7 @@ void *loader_device_heap_realloc(const struct loader_d
4	}
5
6	// Environment variables
7	-#if defined(__linux__)
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

Added Link Here

(-)i/graphics/vulkan-sdk/files/patch-loader_vk__loader__platform.h (+11 lines)
1	--- loader/vk_loader_platform.h.orig 2017-08-10 15:50:41 UTC
2	+++ loader/vk_loader_platform.h
3	@@ -30,7 +30,7 @@
4	#include "vulkan/vk_platform.h"
5	#include "vulkan/vk_sdk_platform.h"
6
7	-#if defined(__linux__)
8	+#if defined(__unix__)
9	/* Linux-specific common code: */
10
11	// Headers:

Added Link Here

(-)i/graphics/vulkan-sdk/files/patch-tests_CMakeLists.txt (+11 lines)
1	--- tests/CMakeLists.txt.orig 2017-08-10 15:50:41 UTC
2	+++ tests/CMakeLists.txt
3	@@ -5,7 +5,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)
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()

Added Link Here

(-)i/graphics/vulkan-sdk/pkg-descr (+7 lines)
1	Vulkan is a low-level cross-platform 3D graphics and compute API.
2
3	This port provides the Khronos official ICD loader and validation layers for
4	Vulkan applications. The ICD (Installable Client Driver) loader is necessary
5	for loading Vulkan drivers.
6
7	WWW: https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers




%%DEMOS%%bin/smoketest
%%DEMOS%%bin/vulkaninfo
etc/vulkan/explicit_layer.d/VkLayer_core_validation.json
etc/vulkan/explicit_layer.d/VkLayer_object_tracker.json
etc/vulkan/explicit_layer.d/VkLayer_parameter_validation.json
etc/vulkan/explicit_layer.d/VkLayer_standard_validation.json
etc/vulkan/explicit_layer.d/VkLayer_threading.json
etc/vulkan/explicit_layer.d/VkLayer_unique_objects.json
include/vulkan/vk_icd.h
include/vulkan/vk_layer.h
include/vulkan/vk_layer_dispatch_table.h
include/vulkan/vk_platform.h
include/vulkan/vk_sdk_platform.h
include/vulkan/vulkan.h
include/vulkan/vulkan.hpp
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.so
lib/libvulkan.so
lib/libvulkan.so.1
lib/libvulkan.so.1.0.68
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= 2.3-1838
5	DISTVERSIONSUFFIX= -g2651ccaec8
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 (+53 lines)
1	bin/glslangValidator
2	bin/spirv-remap
3	include/SPIRV/GLSL.ext.AMD.h
4	include/SPIRV/GLSL.ext.KHR.h
5	include/SPIRV/GLSL.ext.NV.h
6	include/SPIRV/GLSL.std.450.h
7	include/SPIRV/GlslangToSpv.h
8	include/SPIRV/Logger.h
9	include/SPIRV/SPVRemapper.h
10	include/SPIRV/SpvBuilder.h
11	include/SPIRV/bitutils.h
12	include/SPIRV/disassemble.h
13	include/SPIRV/doc.h
14	include/SPIRV/hex_float.h
15	include/SPIRV/spirv.hpp
16	include/SPIRV/spvIR.h
17	include/glslang/Include/BaseTypes.h
18	include/glslang/Include/Common.h
19	include/glslang/Include/ConstantUnion.h
20	include/glslang/Include/InfoSink.h
21	include/glslang/Include/InitializeGlobals.h
22	include/glslang/Include/PoolAlloc.h
23	include/glslang/Include/ResourceLimits.h
24	include/glslang/Include/ShHandle.h
25	include/glslang/Include/Types.h
26	include/glslang/Include/arrays.h
27	include/glslang/Include/intermediate.h
28	include/glslang/Include/revision.h
29	include/glslang/MachineIndependent/Initialize.h
30	include/glslang/MachineIndependent/LiveTraverser.h
31	include/glslang/MachineIndependent/ParseHelper.h
32	include/glslang/MachineIndependent/RemoveTree.h
33	include/glslang/MachineIndependent/Scan.h
34	include/glslang/MachineIndependent/ScanContext.h
35	include/glslang/MachineIndependent/SymbolTable.h
36	include/glslang/MachineIndependent/Versions.h
37	include/glslang/MachineIndependent/attribute.h
38	include/glslang/MachineIndependent/gl_types.h
39	include/glslang/MachineIndependent/glslang_tab.cpp.h
40	include/glslang/MachineIndependent/iomapper.h
41	include/glslang/MachineIndependent/localintermediate.h
42	include/glslang/MachineIndependent/parseVersions.h
43	include/glslang/MachineIndependent/preprocessor/PpContext.h
44	include/glslang/MachineIndependent/preprocessor/PpTokens.h
45	include/glslang/MachineIndependent/propagateNoContraction.h
46	include/glslang/MachineIndependent/reflection.h
47	include/glslang/Public/ShaderLang.h
48	lib/libHLSL.a
49	lib/libOGLCompiler.a
50	lib/libOSDependent.a
51	lib/libSPIRV.a
52	lib/libSPVRemapper.a
53	lib/libglslang.a

Added Link Here

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

Added Link Here

(-)i/devel/spirv-tools/pkg-plist (+16 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.a
16	libdata/pkgconfig/SPIRV-Tools.pc

Added Link Here

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

Added Link Here

(-)i/graphics/vulkan-sdk/files/patch-CMakeLists.txt (+42 lines)
1	--- CMakeLists.txt.orig 2018-02-08 21:01:02.000000000 +0300
2	+++ CMakeLists.txt 2018-02-27 02:24:21.988361000 +0300
3	@@ -28,8 +28,8 @@
4	set_property(GLOBAL PROPERTY USE_FOLDERS ON)
5	set(LVL_TARGET_FOLDER lvl_cmake_targets)
6
7	-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
8	- set(FALLBACK_CONFIG_DIRS "/etc/xdg" CACHE STRING
9	+if(UNIX AND NOT APPLE)
10	+ set(FALLBACK_CONFIG_DIRS "${CMAKE_INSTALL_PREFIX}/etc/xdg:/etc/xdg" CACHE STRING
11	"Search path to use when XDG_CONFIG_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant.")
12	set(FALLBACK_DATA_DIRS "/usr/local/share:/usr/share" CACHE STRING
13	"Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant.")
14	@@ -43,10 +43,12 @@
15
16	if (BUILD_WSI_XCB_SUPPORT)
17	find_package(XCB REQUIRED)
18	+ include_directories(SYSTEM ${XCB_INCLUDE_DIR})
19	endif()
20
21	if (BUILD_WSI_XLIB_SUPPORT)
22	find_package(X11 REQUIRED)
23	+ include_directories(SYSTEM ${X11_Xlib_INCLUDE_PATH})
24	endif()
25
26	if (BUILD_WSI_WAYLAND_SUPPORT)
27	@@ -357,7 +359,14 @@
28	run_vk_xml_generate(helper_file_generator.py vk_object_types.h)
29	run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h)
30	run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h)
31	-run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
32	+file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/spirv_tools_commit_id.h "
33	+#pragma once
34	+#define SPIRV_TOOLS_COMMIT_ID \"9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8\"
35	+")
36	+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/spirv_tools_commit_id.h "
37	+#pragma once
38	+#define SPIRV_TOOLS_COMMIT_ID \"9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8\"
39	+")
40
41
42

Added Link Here

(-)i/graphics/vulkan-sdk/files/patch-demos_smoke_CMakeLists.txt (+14 lines)
1	--- demos/smoke/CMakeLists.txt.orig 2017-08-10 15:50:41 UTC
2	+++ demos/smoke/CMakeLists.txt
3	@@ -61,7 +61,10 @@ if(WIN32)
4
5	list(APPEND sources ShellWin32.cpp ShellWin32.h)
6	else()
7	- list(APPEND libraries PRIVATE -ldl -lrt)
8	+ if(CMAKE_SYSTEM_NAME MATCHES "^(Linux\|kFreeBSD\|GNU\|SunOS)$")
9	+ list(APPEND libraries PRIVATE -lrt)
10	+ endif()
11	+ list(APPEND libraries PRIVATE ${CMAKE_DL_LIBS})
12
13	if(BUILD_WSI_XCB_SUPPORT AND DEMOS_WSI_SELECTION STREQUAL "XCB")
14	find_package(XCB REQUIRED)

Added Link Here

(-)i/graphics/vulkan-sdk/files/patch-loader_CMakeLists.txt (+20 lines)
1	--- loader/CMakeLists.txt.orig 2017-08-10 15:50:41 UTC
2	+++ loader/CMakeLists.txt
3	@@ -25,7 +25,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)
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	@@ -186,7 +186,7 @@ else()
13	add_library(${API_LOWERCASE} SHARED ${NORMAL_LOADER_SRCS} ${OPT_LOADER_SRCS})
14	add_dependencies(${API_LOWERCASE} generate_helper_files loader_gen_files loader_asm_gen_files)
15	set_target_properties(${API_LOWERCASE} PROPERTIES SOVERSION "1" VERSION "1.0.${vk_header_version}")
16	- target_link_libraries(${API_LOWERCASE} -ldl -lpthread -lm)
17	+ target_link_libraries(${API_LOWERCASE} -lpthread -lm ${CMAKE_DL_LIBS})
18
19	if(INSTALL_LVL_FILES)
20	install(TARGETS ${API_LOWERCASE} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

Added Link Here

(-)i/graphics/vulkan-sdk/pkg-plist (+25 lines)
1	%%DEMOS%%bin/smoketest
2	%%DEMOS%%bin/vulkaninfo
3	etc/vulkan/explicit_layer.d/VkLayer_core_validation.json
4	etc/vulkan/explicit_layer.d/VkLayer_object_tracker.json
5	etc/vulkan/explicit_layer.d/VkLayer_parameter_validation.json
6	etc/vulkan/explicit_layer.d/VkLayer_standard_validation.json
7	etc/vulkan/explicit_layer.d/VkLayer_threading.json
8	etc/vulkan/explicit_layer.d/VkLayer_unique_objects.json
9	include/vulkan/vk_icd.h
10	include/vulkan/vk_layer.h
11	include/vulkan/vk_layer_dispatch_table.h
12	include/vulkan/vk_platform.h
13	include/vulkan/vk_sdk_platform.h
14	include/vulkan/vulkan.h
15	include/vulkan/vulkan.hpp
16	lib/libVkLayer_core_validation.so
17	lib/libVkLayer_object_tracker.so
18	lib/libVkLayer_parameter_validation.so
19	lib/libVkLayer_threading.so
20	lib/libVkLayer_unique_objects.so
21	lib/libVkLayer_utils.so
22	lib/libvulkan.so
23	lib/libvulkan.so.1
24	lib/libvulkan.so.1.0.68
25	libdata/pkgconfig/vulkan.pc