Attachment 186206 Details for Bug 222175 – The patch

[patch] The patch

vulkan-sdk-glslang-devel-spirv-tools-devel.patch (text/plain), 19.81 KB, created by Val Packett on 2017-09-09 19:45:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2017-09-09 19:45:54 UTC

Size: 19.81 KB

patch

obsolete

>diff --git c/devel/glslang-devel/Makefile i/devel/glslang-devel/Makefile
>new file mode 100644
>index 000000000000..b0a8360ac61f
>--- /dev/null
>+++ i/devel/glslang-devel/Makefile
>@@ -0,0 +1,22 @@
>+# $FreeBSD$
>+
>+PORTNAME=	glslang-devel
>+DISTVERSION=	Overload400-PrecQual.2000-12-Apr-2017
>+CATEGORIES=	devel graphics
>+
>+MAINTAINER=	greg@unrelenting.technology
>+COMMENT=	OpenGL and OpenGL ES shader front end and validator
>+
>+LICENSE=	BSD3DLABS
>+LICENSE_NAME=	Modified BSD License (3Dlabs/LunarG)
>+LICENSE_FILE=	${FILESDIR}/LICENSE
>+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
>+
>+USES=	cmake:outsource compiler:c++11-lang
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	KhronosGroup
>+GH_PROJECT=	glslang
>+GH_TAGNAME=	d5aedc199
>+
>+.include <bsd.port.mk>
>diff --git c/devel/glslang-devel/distinfo i/devel/glslang-devel/distinfo
>new file mode 100644
>index 000000000000..390ab2028d95
>--- /dev/null
>+++ i/devel/glslang-devel/distinfo
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1504982098
>+SHA256 (KhronosGroup-glslang-Overload400-PrecQual.2000-12-Apr-2017-d5aedc199_GH0.tar.gz) = 2fcbff82c6ea27a2a5ff196227a3712c5d02a723646b1e5c59a54237b52d4726
>+SIZE (KhronosGroup-glslang-Overload400-PrecQual.2000-12-Apr-2017-d5aedc199_GH0.tar.gz) = 1857485
>diff --git c/devel/glslang-devel/files/LICENSE i/devel/glslang-devel/files/LICENSE
>new file mode 100644
>index 000000000000..dfffea6a8c12
>--- /dev/null
>+++ i/devel/glslang-devel/files/LICENSE
>@@ -0,0 +1,35 @@
>+//
>+//Copyright (C) 2002-2005 3Dlabs Inc. Ltd.
>+//Copyright (C) 2012-2013 LunarG, Inc.
>+//
>+//All rights reserved.
>+//
>+//Redistribution and use in source and binary forms, with or without
>+//modification, are permitted provided that the following conditions
>+//are met:
>+//
>+// Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+//
>+// Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following
>+// disclaimer in the documentation and/or other materials provided
>+// with the distribution.
>+//
>+// Neither the name of 3Dlabs Inc. Ltd. nor the names of its
>+// contributors may be used to endorse or promote products derived
>+// from this software without specific prior written permission.
>+//
>+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
>+//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
>+//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
>+//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
>+//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
>+//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
>+//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
>+//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
>+//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>+//POSSIBILITY OF SUCH DAMAGE.
>+//
>diff --git c/devel/glslang-devel/pkg-descr i/devel/glslang-devel/pkg-descr
>new file mode 100644
>index 000000000000..d83d485a0adf
>--- /dev/null
>+++ i/devel/glslang-devel/pkg-descr
>@@ -0,0 +1,4 @@
>+Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator.
>+
>+WWW: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
>+WWW: https://github.com/KhronosGroup/glslang
>diff --git c/devel/glslang-devel/pkg-plist i/devel/glslang-devel/pkg-plist
>new file mode 100644
>index 000000000000..4a8998983108
>--- /dev/null
>+++ i/devel/glslang-devel/pkg-plist
>@@ -0,0 +1,52 @@
>+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/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
>diff --git c/devel/spirv-tools-devel/Makefile i/devel/spirv-tools-devel/Makefile
>new file mode 100644
>index 000000000000..01d846255a27
>--- /dev/null
>+++ i/devel/spirv-tools-devel/Makefile
>@@ -0,0 +1,22 @@
>+# $FreeBSD$
>+
>+PORTNAME=	spirv-tools-devel
>+DISTVERSION=	v2016.7-dev
>+CATEGORIES=	devel graphics
>+
>+MAINTAINER=	greg@unrelenting.technology
>+COMMENT=	Tools for processing SPIR-V intermediate shader language modules
>+
>+LICENSE=	APACHE20
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
>+USES=	cmake:outsource compiler:c++11-lang python:2
>+
>+USE_GITHUB=	yes
>+GH_TUPLE=	KhronosGroup:SPIRV-Tools:f0fe601d \
>+		KhronosGroup:SPIRV-Headers:2bb92e6f:headers/external/spirv-headers
>+
>+CMAKE_ARGS+=	-DSPIRV_SKIP_TESTS:BOOL=ON \
>+		-DSPIRV_WERROR:BOOL=OFF
>+
>+.include <bsd.port.mk>
>diff --git c/devel/spirv-tools-devel/distinfo i/devel/spirv-tools-devel/distinfo
>new file mode 100644
>index 000000000000..53fdf6cf913a
>--- /dev/null
>+++ i/devel/spirv-tools-devel/distinfo
>@@ -0,0 +1,5 @@
>+TIMESTAMP = 1504983235
>+SHA256 (KhronosGroup-SPIRV-Tools-v2016.7-dev-f0fe601d_GH0.tar.gz) = 8d48dc00be36ee4d66a6ca2cacfe3112c0d6b98b17cd5e2024fb172bca385ff3
>+SIZE (KhronosGroup-SPIRV-Tools-v2016.7-dev-f0fe601d_GH0.tar.gz) = 538416
>+SHA256 (KhronosGroup-SPIRV-Headers-2bb92e6f_GH0.tar.gz) = 08dd4f8b4adbda3c863579dcec29c0eeccc30ed7eb05dc931152df60f7d0861c
>+SIZE (KhronosGroup-SPIRV-Headers-2bb92e6f_GH0.tar.gz) = 154892
>diff --git c/devel/spirv-tools-devel/pkg-descr i/devel/spirv-tools-devel/pkg-descr
>new file mode 100644
>index 000000000000..069e3fc4ed73
>--- /dev/null
>+++ i/devel/spirv-tools-devel/pkg-descr
>@@ -0,0 +1,11 @@
>+The SPIR-V Tools project provides an API and commands for processing SPIR-V
>+modules.
>+
>+The project includes an assembler, binary module parser, disassembler,
>+validator, and optimizer for SPIR-V.  Except for the optimizer, all are based
>+on a common static library.  The library contains all of the implementation
>+details, and is used in the standalone tools whilst also enabling integration
>+into other code bases directly.  The optimizer implementation resides in its own
>+library, which depends on the core library.
>+
>+WWW: https://github.com/KhronosGroup/SPIRV-Tools
>diff --git c/devel/spirv-tools-devel/pkg-plist i/devel/spirv-tools-devel/pkg-plist
>new file mode 100644
>index 000000000000..cd9c85ce3aa8
>--- /dev/null
>+++ i/devel/spirv-tools-devel/pkg-plist
>@@ -0,0 +1,14 @@
>+bin/spirv-as
>+bin/spirv-cfg
>+bin/spirv-dis
>+bin/spirv-lesspipe.sh
>+bin/spirv-markv
>+bin/spirv-opt
>+bin/spirv-stats
>+bin/spirv-val
>+include/spirv-tools/libspirv.h
>+include/spirv-tools/libspirv.hpp
>+include/spirv-tools/optimizer.hpp
>+lib/libSPIRV-Tools-comp.a
>+lib/libSPIRV-Tools-opt.a
>+lib/libSPIRV-Tools.a
>diff --git c/graphics/vulkan-sdk/Makefile i/graphics/vulkan-sdk/Makefile
>new file mode 100644
>index 000000000000..e06428d8ee57
>--- /dev/null
>+++ i/graphics/vulkan-sdk/Makefile
>@@ -0,0 +1,55 @@
>+# $FreeBSD$
>+
>+PORTNAME=	vulkan-sdk
>+DISTVERSIONPREFIX=	sdk-
>+DISTVERSION=	1.0.57.0
>+CATEGORIES=	graphics devel
>+
>+MAINTAINER=	greg@unrelenting.technology
>+COMMENT=	Vulkan SDK (Headers, ICD Loader, Validation Layers)
>+
>+LICENSE=	APACHE20
>+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
>+
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
>+	${LOCALBASE}/include/spirv-tools/libspirv.h:devel/spirv-tools-devel \
>+	glslangValidator:devel/glslang-devel
>+
>+USES=	cmake:outsource compiler:c++11-lang python:3 pkgconfig
>+
>+USE_LDCONFIG=	yes
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	KhronosGroup
>+GH_PROJECT=	Vulkan-LoaderAndValidationLayers
>+
>+CMAKE_ARGS+=	-DBUILD_TESTS:BOOL=OFF \
>+							-DCMAKE_SKIP_RPATH:BOOL=ON \
>+							-DBUILD_WSI_MIR_SUPPORT:BOOL=OFF
>+
>+OPTIONS_DEFINE=	XLIB XCB WAYLAND DEMOS
>+OPTIONS_DEFAULT=	XLIB XCB 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_ON=	-DBUILD_WSI_XLIB_SUPPORT:BOOL=ON
>+XLIB_CMAKE_OFF=	-DBUILD_WSI_XLIB_SUPPORT:BOOL=OFF
>+XLIB_LIB_DEPENDS=	libX11.so:x11/libX11
>+XCB_CMAKE_ON=	-DBUILD_WSI_XCB_SUPPORT:BOOL=ON
>+XCB_CMAKE_OFF=	-DBUILD_WSI_XCB_SUPPORT:BOOL=OFF
>+XCB_LIB_DEPENDS=	libX11-xcb.so:x11/libX11 \
>+		libxcb.so:x11/libxcb
>+WAYLAND_CMAKE_ON=	-DBUILD_WSI_WAYLAND_SUPPORT:BOOL=ON
>+WAYLAND_CMAKE_OFF=	-DBUILD_WSI_WAYLAND_SUPPORT:BOOL=OFF
>+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_ON=	-DBUILD_DEMOS:BOOL=ON
>+DEMOS_CMAKE_OFF=	-DBUILD_DEMOS:BOOL=OFF
>+
>+.include <bsd.port.mk>
>diff --git c/graphics/vulkan-sdk/distinfo i/graphics/vulkan-sdk/distinfo
>new file mode 100644
>index 000000000000..d84420f43d56
>--- /dev/null
>+++ i/graphics/vulkan-sdk/distinfo
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1504980231
>+SHA256 (KhronosGroup-Vulkan-LoaderAndValidationLayers-sdk-1.0.57.0_GH0.tar.gz) = a425caf7cdd4328555de20174e40092aeff491cc511bfc65435fa66dc983461e
>+SIZE (KhronosGroup-Vulkan-LoaderAndValidationLayers-sdk-1.0.57.0_GH0.tar.gz) = 3851540
>diff --git c/graphics/vulkan-sdk/files/patch-CMakeLists.txt i/graphics/vulkan-sdk/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..083c63248e68
>--- /dev/null
>+++ i/graphics/vulkan-sdk/files/patch-CMakeLists.txt
>@@ -0,0 +1,24 @@
>+--- CMakeLists.txt.orig	2017-08-10 15:50:41 UTC
>++++ CMakeLists.txt
>+@@ -15,8 +15,8 @@ string(TOLOWER ${API_NAME} API_LOWERCASE)
>+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
>+ find_package(PythonInterp 3 REQUIRED)
>+ 
>+-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
>+-    set(FALLBACK_CONFIG_DIRS "/etc/xdg" CACHE STRING
>++if((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD"))
>++    set(FALLBACK_CONFIG_DIRS "/usr/local/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.")
>+@@ -49,6 +49,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
>+     # VulkanTools and VulkanSamples repos.  This can be used to prevent the
>+     # overwriting of LVL artifacts when installing these downstream repos.
>+     option(INSTALL_LVL_FILES "Install content from LoaderAndValidationLayers repo" ON)
>++endif()
>++
>++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
>++    include_directories("/usr/local/include")
>+ endif()
>+ 
>+ set(SCRIPTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/scripts")
>diff --git c/graphics/vulkan-sdk/files/patch-demos_CMakeLists.txt i/graphics/vulkan-sdk/files/patch-demos_CMakeLists.txt
>new file mode 100644
>index 000000000000..c7037eba1db4
>--- /dev/null
>+++ i/graphics/vulkan-sdk/files/patch-demos_CMakeLists.txt
>@@ -0,0 +1,11 @@
>+--- demos/CMakeLists.txt.orig	2017-08-10 15:50:41 UTC
>++++ demos/CMakeLists.txt
>+@@ -3,7 +3,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((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD"))
>+     if (NOT DEMOS_WSI_SELECTION)
>+         set(DEMOS_WSI_SELECTION "XCB")
>+     endif()
>diff --git c/graphics/vulkan-sdk/files/patch-demos_cube.cpp i/graphics/vulkan-sdk/files/patch-demos_cube.cpp
>new file mode 100644
>index 000000000000..615ad2f10a71
>--- /dev/null
>+++ i/graphics/vulkan-sdk/files/patch-demos_cube.cpp
>@@ -0,0 +1,11 @@
>+--- demos/cube.cpp.orig	2017-08-10 15:50:41 UTC
>++++ demos/cube.cpp
>+@@ -2948,7 +2948,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
>+     return (int)msg.wParam;
>+ }
>+ 
>+-#elif __linux__
>++#elif defined(__linux__) || defined(__FreeBSD__)
>+ 
>+ int main(int argc, char **argv) {
>+     Demo demo;
>diff --git c/graphics/vulkan-sdk/files/patch-demos_smoke_CMakeLists.txt i/graphics/vulkan-sdk/files/patch-demos_smoke_CMakeLists.txt
>new file mode 100644
>index 000000000000..c1ab703bb97d
>--- /dev/null
>+++ i/graphics/vulkan-sdk/files/patch-demos_smoke_CMakeLists.txt
>@@ -0,0 +1,14 @@
>+--- 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)
>++    list(APPEND libraries PRIVATE -lrt)
>++    if(NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
>++        list(APPEND libraries PRIVATE -ldl)
>++    endif()
>+ 
>+     if(BUILD_WSI_XCB_SUPPORT AND DEMOS_WSI_SELECTION STREQUAL "XCB")
>+         find_package(XCB REQUIRED)
>diff --git c/graphics/vulkan-sdk/files/patch-layers_CMakeLists.txt i/graphics/vulkan-sdk/files/patch-layers_CMakeLists.txt
>new file mode 100644
>index 000000000000..b2696a440d49
>--- /dev/null
>+++ i/graphics/vulkan-sdk/files/patch-layers_CMakeLists.txt
>@@ -0,0 +1,11 @@
>+--- layers/CMakeLists.txt.orig	2017-08-10 15:50:41 UTC
>++++ layers/CMakeLists.txt
>+@@ -4,7 +4,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((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD"))
>+     if (BUILD_WSI_XCB_SUPPORT)
>+         add_definitions(-DVK_USE_PLATFORM_XCB_KHR -DVK_USE_PLATFORM_XCB_KHX)
>+     endif()
>diff --git c/graphics/vulkan-sdk/files/patch-loader_CMakeLists.txt i/graphics/vulkan-sdk/files/patch-loader_CMakeLists.txt
>new file mode 100644
>index 000000000000..86629a1e45f6
>--- /dev/null
>+++ i/graphics/vulkan-sdk/files/patch-loader_CMakeLists.txt
>@@ -0,0 +1,23 @@
>+--- 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((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD"))
>+     if (BUILD_WSI_XCB_SUPPORT)
>+         add_definitions(-DVK_USE_PLATFORM_XCB_KHR)
>+     endif()
>+@@ -186,7 +186,10 @@ 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)
>++    if(NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
>++        target_link_libraries(${API_LOWERCASE} -ldl)
>++    endif()
>+ 
>+     if(INSTALL_LVL_FILES)
>+         install(TARGETS ${API_LOWERCASE} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
>diff --git c/graphics/vulkan-sdk/files/patch-loader_loader.c i/graphics/vulkan-sdk/files/patch-loader_loader.c
>new file mode 100644
>index 000000000000..4da1a0f077ab
>--- /dev/null
>+++ i/graphics/vulkan-sdk/files/patch-loader_loader.c
>@@ -0,0 +1,11 @@
>+--- loader/loader.c.orig	2017-08-10 15:50:41 UTC
>++++ loader/loader.c
>+@@ -204,7 +204,7 @@ void *loader_device_heap_realloc(const struct loader_d
>+ }
>+ 
>+ // Environment variables
>+-#if defined(__linux__)
>++#if defined(__linux__) || defined(__FreeBSD__)
>+ 
>+ 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
>diff --git c/graphics/vulkan-sdk/files/patch-loader_vk__loader__platform.h i/graphics/vulkan-sdk/files/patch-loader_vk__loader__platform.h
>new file mode 100644
>index 000000000000..f3d503e4743d
>--- /dev/null
>+++ i/graphics/vulkan-sdk/files/patch-loader_vk__loader__platform.h
>@@ -0,0 +1,11 @@
>+--- loader/vk_loader_platform.h.orig	2017-08-10 15:50:41 UTC
>++++ loader/vk_loader_platform.h
>+@@ -30,7 +30,7 @@
>+ #include "vulkan/vk_platform.h"
>+ #include "vulkan/vk_sdk_platform.h"
>+ 
>+-#if defined(__linux__)
>++#if defined(__linux__) || defined(__FreeBSD__)
>+ /* Linux-specific common code: */
>+ 
>+ // Headers:
>diff --git c/graphics/vulkan-sdk/files/patch-tests_CMakeLists.txt i/graphics/vulkan-sdk/files/patch-tests_CMakeLists.txt
>new file mode 100644
>index 000000000000..bc0b7505abc1
>--- /dev/null
>+++ i/graphics/vulkan-sdk/files/patch-tests_CMakeLists.txt
>@@ -0,0 +1,11 @@
>+--- tests/CMakeLists.txt.orig	2017-08-10 15:50:41 UTC
>++++ tests/CMakeLists.txt
>+@@ -5,7 +5,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((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD"))
>+     if (BUILD_WSI_XCB_SUPPORT)
>+         add_definitions(-DVK_USE_PLATFORM_XCB_KHR)
>+     endif()
>diff --git c/graphics/vulkan-sdk/pkg-descr i/graphics/vulkan-sdk/pkg-descr
>new file mode 100644
>index 000000000000..1132e42168bd
>--- /dev/null
>+++ i/graphics/vulkan-sdk/pkg-descr
>@@ -0,0 +1,7 @@
>+Vulkan is a low-level cross-platform 3D graphics and compute API.
>+
>+This port provides the Khronos official ICD loader and validation layers for
>+Vulkan applications. The ICD (Installable Client Driver) loader is necessary
>+for loading Vulkan drivers.
>+
>+WWW: https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers
>diff --git c/graphics/vulkan-sdk/pkg-plist i/graphics/vulkan-sdk/pkg-plist
>new file mode 100644
>index 000000000000..ca6f4b40cd30
>--- /dev/null
>+++ i/graphics/vulkan-sdk/pkg-plist
>@@ -0,0 +1,24 @@
>+%%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_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.57
>+libdata/pkgconfig/vulkan.pc

Actions: View | Diff

Attachments on bug 222175: 186206 | 186513 | 189119 | 191036 | 191374 | 195987