View | Details | Raw Unified | Return to bug 222175 | Differences between
and this patch

Collapse All | Expand All

(-)i/devel/glslang/Makefile (+24 lines)
Added Link Here
1
# $FreeBSD$
2
3
PORTNAME=	glslang
4
DISTVERSION=	3.0-1516
5
DISTVERSIONSUFFIX=	-gd5aedc19
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>
(-)i/devel/glslang/distinfo (+3 lines)
Added Link Here
1
TIMESTAMP = 1505748698
2
SHA256 (KhronosGroup-glslang-3.0-1516-gd5aedc19_GH0.tar.gz) = e4ef7e75e3446d67636707d8963ebf6705afd5fa7f109f56f95b78c5b4dc3fdc
3
SIZE (KhronosGroup-glslang-3.0-1516-gd5aedc19_GH0.tar.gz) = 1858265
(-)i/devel/glslang/pkg-descr (+5 lines)
Added Link Here
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/
(-)i/devel/glslang/pkg-plist (+52 lines)
Added Link Here
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/gl_types.h
38
include/glslang/MachineIndependent/glslang_tab.cpp.h
39
include/glslang/MachineIndependent/iomapper.h
40
include/glslang/MachineIndependent/localintermediate.h
41
include/glslang/MachineIndependent/parseVersions.h
42
include/glslang/MachineIndependent/preprocessor/PpContext.h
43
include/glslang/MachineIndependent/preprocessor/PpTokens.h
44
include/glslang/MachineIndependent/propagateNoContraction.h
45
include/glslang/MachineIndependent/reflection.h
46
include/glslang/Public/ShaderLang.h
47
lib/libHLSL.a
48
lib/libOGLCompiler.a
49
lib/libOSDependent.a
50
lib/libSPIRV.a
51
lib/libSPVRemapper.a
52
lib/libglslang.a
(-)i/devel/spirv-tools/Makefile (+25 lines)
Added Link Here
1
# $FreeBSD$
2
3
PORTNAME=	spirv-tools
4
DISTVERSIONPREFIX=	v
5
DISTVERSION=	2016.6-155
6
DISTVERSIONSUFFIX=	-gf0fe601
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:2bb92e6f:headers/external/spirv-headers
21
22
CMAKE_ARGS+=	-DSPIRV_SKIP_TESTS:BOOL=ON \
23
		-DSPIRV_WERROR:BOOL=OFF
24
25
.include <bsd.port.mk>
(-)i/devel/spirv-tools/distinfo (+5 lines)
Added Link Here
1
TIMESTAMP = 1505748790
2
SHA256 (KhronosGroup-SPIRV-Tools-v2016.6-155-gf0fe601_GH0.tar.gz) = b3348b3e6aa7ec3ffd82ed01d295a91ab3e6e800f10b8303ef722f103f6b35e0
3
SIZE (KhronosGroup-SPIRV-Tools-v2016.6-155-gf0fe601_GH0.tar.gz) = 538566
4
SHA256 (KhronosGroup-SPIRV-Headers-2bb92e6f_GH0.tar.gz) = 08dd4f8b4adbda3c863579dcec29c0eeccc30ed7eb05dc931152df60f7d0861c
5
SIZE (KhronosGroup-SPIRV-Headers-2bb92e6f_GH0.tar.gz) = 154892
(-)i/devel/spirv-tools/pkg-descr (+11 lines)
Added Link Here
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
(-)i/devel/spirv-tools/pkg-plist (+14 lines)
Added Link Here
1
bin/spirv-as
2
bin/spirv-cfg
3
bin/spirv-dis
4
bin/spirv-lesspipe.sh
5
bin/spirv-markv
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/optimizer.hpp
12
lib/libSPIRV-Tools-comp.a
13
lib/libSPIRV-Tools-opt.a
14
lib/libSPIRV-Tools.a
(-)i/graphics/vulkan-sdk/Makefile (+51 lines)
Added Link Here
1
# $FreeBSD$
2
3
PORTNAME=	vulkan-sdk
4
DISTVERSIONPREFIX=	sdk-
5
DISTVERSION=	1.0.57.0
6
CATEGORIES=	graphics devel
7
8
MAINTAINER=	greg@unrelenting.technology
9
COMMENT=	Vulkan SDK (Headers, ICD Loader, Validation Layers)
10
11
LICENSE=	APACHE20
12
13
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
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
							-DCMAKE_SKIP_RPATH:BOOL=ON \
27
							-DBUILD_WSI_MIR_SUPPORT:BOOL=OFF
28
29
OPTIONS_DEFINE=	XLIB XCB WAYLAND DEMOS
30
OPTIONS_DEFAULT=	XLIB XCB DEMOS
31
OPTIONS_SUB=	yes
32
33
XLIB_DESC=	Build Xlib WSI (Window System Integration) support
34
XCB_DESC=	Build XCB WSI (Window System Integration) support
35
WAYLAND_DESC=	Build Wayland WSI (Window System Integration) support
36
DEMOS_DESC=	Build demos (including vulkaninfo)
37
38
XLIB_CMAKE_BOOL=	BUILD_WSI_XLIB_SUPPORT
39
XLIB_LIB_DEPENDS=	libX11.so:x11/libX11 \
40
		libXrandr.so:x11/libXrandr
41
XCB_CMAKE_BOOL=	BUILD_WSI_XCB_SUPPORT
42
XCB_LIB_DEPENDS=	libX11-xcb.so:x11/libX11 \
43
		libxcb.so:x11/libxcb
44
WAYLAND_CMAKE_BOOL=	BUILD_WSI_WAYLAND_SUPPORT
45
WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
46
		libwayland-server.so:graphics/wayland \
47
		libwayland-cursor.so:graphics/wayland \
48
		libwayland-egl.so:graphics/mesa-libs
49
DEMOS_CMAKE_BOOL=	BUILD_DEMOS
50
51
.include <bsd.port.mk>
(-)i/graphics/vulkan-sdk/files/patch-CMakeLists.txt (+26 lines)
Added Link Here
1
--- CMakeLists.txt.orig	2017-08-10 15:50:41 UTC
2
+++ CMakeLists.txt
3
@@ -15,8 +15,8 @@ string(TOLOWER ${API_NAME} API_LOWERCASE)
4
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
5
 find_package(PythonInterp 3 REQUIRED)
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
@@ -30,10 +30,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
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)
(-)i/graphics/vulkan-sdk/files/patch-demos_CMakeLists.txt (+11 lines)
Added Link Here
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()
(-)i/graphics/vulkan-sdk/files/patch-demos_cube.cpp (+11 lines)
Added Link Here
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;
(-)i/graphics/vulkan-sdk/files/patch-demos_smoke_CMakeLists.txt (+14 lines)
Added Link Here
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)
(-)i/graphics/vulkan-sdk/files/patch-layers_CMakeLists.txt (+11 lines)
Added Link Here
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()
(-)i/graphics/vulkan-sdk/files/patch-loader_CMakeLists.txt (+20 lines)
Added Link Here
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})
(-)i/graphics/vulkan-sdk/files/patch-loader_loader.c (+11 lines)
Added Link Here
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
(-)i/graphics/vulkan-sdk/files/patch-loader_vk__loader__platform.h (+11 lines)
Added Link Here
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:
(-)i/graphics/vulkan-sdk/files/patch-tests_CMakeLists.txt (+11 lines)
Added Link Here
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()

Return to bug 222175