update vulkan ports to sdk 1.2.141.0
disable _XOPEN_SOURCE=500 to fix finding definition of alloca(3) ok jsg@ whose original diff this was based on, and who found the alloca fix live long and prosper
This commit is contained in:
thfr
parent
2d46f6ee5c
commit
127f24c78f
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.3 2019/07/27 15:47:35 thfr Exp $
|
||||
# $OpenBSD: Makefile,v 1.4 2020/07/07 08:08:03 thfr Exp $
|
||||
|
||||
COMMENT = reference front-end for GLSL and ESSL
|
||||
|
||||
GH_TAGNAME = 7.11.3214
|
||||
GH_TAGNAME = 8.13.3743
|
||||
GH_ACCOUNT = KhronosGroup
|
||||
GH_PROJECT = glslang
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (glslang-7.11.3214.tar.gz) = swtGaHNDKNJW4wyUA35g03dbEFV0PATY/XCfKWDzAqk=
|
||||
SIZE (glslang-7.11.3214.tar.gz) = 2841979
|
||||
SHA256 (glslang-8.13.3743.tar.gz) = Y56+xW8adALy+glEaaXd6h7O7Pry6e/jYTdqD3On7i8=
|
||||
SIZE (glslang-8.13.3743.tar.gz) = 3183453
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
$OpenBSD: patch-Test_runtests,v 1.1.1.1 2019/06/22 15:19:31 thfr Exp $
|
||||
$OpenBSD: patch-Test_runtests,v 1.2 2020/07/07 08:08:04 thfr Exp $
|
||||
|
||||
Index: Test/runtests
|
||||
--- Test/runtests.orig
|
||||
+++ Test/runtests
|
||||
@@ -2,8 +2,8 @@
|
||||
@@ -7,8 +7,8 @@
|
||||
|
||||
TARGETDIR=localResults
|
||||
TARGETDIR=${1:-localResults}
|
||||
BASEDIR=baseResults
|
||||
-EXE=../build/install/bin/glslangValidator
|
||||
-REMAPEXE=../build/install/bin/spirv-remap
|
||||
+EXE=${WRKBUILD}/StandAlone/glslangValidator
|
||||
+REMAPEXE=${WRKBUILD}/StandAlone/spirv-remap
|
||||
-EXE=${2:-../build/install/bin/glslangValidator}
|
||||
-REMAPEXE=${3:-../build/install/bin/spirv-remap}
|
||||
+EXE=${2:-${WRKBUILD}/StandAlone/glslangValidator}
|
||||
+REMAPEXE=${3:-${WRKBUILD}/StandAlone/spirv-remap}
|
||||
HASERROR=0
|
||||
mkdir -p localResults
|
||||
mkdir -p $TARGETDIR
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/06/22 15:19:31 thfr Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2020/07/07 08:08:04 thfr Exp $
|
||||
@bin bin/glslangValidator
|
||||
@bin bin/spirv-remap
|
||||
include/SPIRV/
|
||||
@ -9,6 +9,7 @@ include/SPIRV/GLSL.ext.NV.h
|
||||
include/SPIRV/GLSL.std.450.h
|
||||
include/SPIRV/GlslangToSpv.h
|
||||
include/SPIRV/Logger.h
|
||||
include/SPIRV/NonSemanticDebugPrintf.h
|
||||
include/SPIRV/SPVRemapper.h
|
||||
include/SPIRV/SpvBuilder.h
|
||||
include/SPIRV/SpvTools.h
|
||||
@ -30,6 +31,8 @@ include/glslang/Include/ResourceLimits.h
|
||||
include/glslang/Include/ShHandle.h
|
||||
include/glslang/Include/Types.h
|
||||
include/glslang/Include/arrays.h
|
||||
include/glslang/Include/glslang_c_interface.h
|
||||
include/glslang/Include/glslang_c_shader_types.h
|
||||
include/glslang/Include/intermediate.h
|
||||
include/glslang/Include/revision.h
|
||||
include/glslang/MachineIndependent/
|
||||
@ -54,9 +57,44 @@ include/glslang/MachineIndependent/propagateNoContraction.h
|
||||
include/glslang/MachineIndependent/reflection.h
|
||||
include/glslang/Public/
|
||||
include/glslang/Public/ShaderLang.h
|
||||
lib/libHLSL.a
|
||||
lib/libOGLCompiler.a
|
||||
lib/libOSDependent.a
|
||||
lib/libSPIRV.a
|
||||
lib/libSPVRemapper.a
|
||||
lib/libglslang.a
|
||||
include/glslang/SPIRV/
|
||||
include/glslang/SPIRV/GLSL.ext.AMD.h
|
||||
include/glslang/SPIRV/GLSL.ext.EXT.h
|
||||
include/glslang/SPIRV/GLSL.ext.KHR.h
|
||||
include/glslang/SPIRV/GLSL.ext.NV.h
|
||||
include/glslang/SPIRV/GLSL.std.450.h
|
||||
include/glslang/SPIRV/GlslangToSpv.h
|
||||
include/glslang/SPIRV/Logger.h
|
||||
include/glslang/SPIRV/NonSemanticDebugPrintf.h
|
||||
include/glslang/SPIRV/SPVRemapper.h
|
||||
include/glslang/SPIRV/SpvBuilder.h
|
||||
include/glslang/SPIRV/SpvTools.h
|
||||
include/glslang/SPIRV/bitutils.h
|
||||
include/glslang/SPIRV/disassemble.h
|
||||
include/glslang/SPIRV/doc.h
|
||||
include/glslang/SPIRV/hex_float.h
|
||||
include/glslang/SPIRV/spirv.hpp
|
||||
include/glslang/SPIRV/spvIR.h
|
||||
lib/cmake/
|
||||
lib/cmake/HLSLTargets${MODCMAKE_BUILD_SUFFIX}
|
||||
lib/cmake/HLSLTargets.cmake
|
||||
lib/cmake/OGLCompilerTargets${MODCMAKE_BUILD_SUFFIX}
|
||||
lib/cmake/OGLCompilerTargets.cmake
|
||||
lib/cmake/OSDependentTargets${MODCMAKE_BUILD_SUFFIX}
|
||||
lib/cmake/OSDependentTargets.cmake
|
||||
lib/cmake/SPIRVTargets${MODCMAKE_BUILD_SUFFIX}
|
||||
lib/cmake/SPIRVTargets.cmake
|
||||
lib/cmake/SPVRemapperTargets${MODCMAKE_BUILD_SUFFIX}
|
||||
lib/cmake/SPVRemapperTargets.cmake
|
||||
lib/cmake/glslangTargets${MODCMAKE_BUILD_SUFFIX}
|
||||
lib/cmake/glslangTargets.cmake
|
||||
lib/cmake/glslangValidatorTargets${MODCMAKE_BUILD_SUFFIX}
|
||||
lib/cmake/glslangValidatorTargets.cmake
|
||||
lib/cmake/spirv-remapTargets${MODCMAKE_BUILD_SUFFIX}
|
||||
lib/cmake/spirv-remapTargets.cmake
|
||||
@static-lib lib/libHLSL.a
|
||||
@static-lib lib/libOGLCompiler.a
|
||||
@static-lib lib/libOSDependent.a
|
||||
@static-lib lib/libSPIRV.a
|
||||
@static-lib lib/libSPVRemapper.a
|
||||
@static-lib lib/libglslang.a
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2019/06/22 16:51:06 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2020/07/07 08:08:04 thfr Exp $
|
||||
|
||||
COMMENT = SPIRV-Headers
|
||||
|
||||
V = 1.4.1
|
||||
V = 1.5.3
|
||||
PKGNAME = spirv-headers-${V}
|
||||
GH_TAGNAME = ${V}
|
||||
GH_ACCOUNT = KhronosGroup
|
||||
@ -16,6 +16,9 @@ MAINTAINER = Thomas Frohwein <thfr@openbsd.org>
|
||||
# BSD-style
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
# C++
|
||||
COMPILER = base-clang ports-gcc base-gcc
|
||||
|
||||
MODULES = devel/cmake
|
||||
|
||||
NO_TEST = Yes
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (SPIRV-Headers-1.4.1.tar.gz) = okTwYp9160UOCQzXc9MOIjZ8sjHpZMdJJYjrkAAgH9E=
|
||||
SIZE (SPIRV-Headers-1.4.1.tar.gz) = 359347
|
||||
SHA256 (SPIRV-Headers-1.5.3.tar.gz) = 7s6KnhR9N5l9Ql1dLusudXrSWtww1mUUZwlPOxhgm1o=
|
||||
SIZE (SPIRV-Headers-1.5.3.tar.gz) = 386853
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/06/22 15:22:27 thfr Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2020/07/07 08:08:05 thfr Exp $
|
||||
include/spirv/
|
||||
include/spirv/1.0/
|
||||
include/spirv/1.0/GLSL.std.450.h
|
||||
@ -41,10 +41,24 @@ include/spirv/1.2/spirv.lua
|
||||
include/spirv/1.2/spirv.py
|
||||
include/spirv/spir-v.xml
|
||||
include/spirv/unified1/
|
||||
include/spirv/unified1/AMD_gcn_shader.h
|
||||
include/spirv/unified1/AMD_shader_ballot.h
|
||||
include/spirv/unified1/AMD_shader_explicit_vertex_parameter.h
|
||||
include/spirv/unified1/AMD_shader_trinary_minmax.h
|
||||
include/spirv/unified1/DebugInfo.h
|
||||
include/spirv/unified1/GLSL.std.450.h
|
||||
include/spirv/unified1/NonSemanticDebugPrintf.h
|
||||
include/spirv/unified1/OpenCL.std.h
|
||||
include/spirv/unified1/OpenCLDebugInfo100.h
|
||||
include/spirv/unified1/extinst.debuginfo.grammar.json
|
||||
include/spirv/unified1/extinst.glsl.std.450.grammar.json
|
||||
include/spirv/unified1/extinst.nonsemantic.debugprintf.grammar.json
|
||||
include/spirv/unified1/extinst.opencl.debuginfo.100.grammar.json
|
||||
include/spirv/unified1/extinst.opencl.std.100.grammar.json
|
||||
include/spirv/unified1/extinst.spv-amd-gcn-shader.grammar.json
|
||||
include/spirv/unified1/extinst.spv-amd-shader-ballot.grammar.json
|
||||
include/spirv/unified1/extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json
|
||||
include/spirv/unified1/extinst.spv-amd-shader-trinary-minmax.grammar.json
|
||||
include/spirv/unified1/spirv.core.grammar.json
|
||||
include/spirv/unified1/spirv.cs
|
||||
include/spirv/unified1/spirv.h
|
||||
@ -54,3 +68,8 @@ include/spirv/unified1/spirv.json
|
||||
include/spirv/unified1/spirv.lua
|
||||
include/spirv/unified1/spirv.py
|
||||
include/spirv/unified1/spv.d
|
||||
lib/cmake/
|
||||
lib/cmake/SPIRV-Headers/
|
||||
lib/cmake/SPIRV-Headers/SPIRV-HeadersConfig.cmake
|
||||
lib/cmake/SPIRV-Headers/SPIRV-HeadersConfigVersion.cmake
|
||||
lib/cmake/SPIRV-Headers/SPIRV-HeadersTargets.cmake
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.4 2019/09/21 14:33:37 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.5 2020/07/07 08:08:05 thfr Exp $
|
||||
|
||||
COMMENT = API and commands for processing SPIR-V
|
||||
|
||||
V = 2019.3
|
||||
V = 2020.3
|
||||
DISTNAME = spirv-tools-${V}
|
||||
GH_ACCOUNT = KhronosGroup
|
||||
GH_PROJECT = SPIRV-Tools
|
||||
@ -29,7 +29,7 @@ MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
|
||||
|
||||
BUILD_DEPENDS = graphics/spirv-headers
|
||||
|
||||
CONFIGURE_ARGS = -DSPIRV_HEADER_DIR="${LOCALBASE}"
|
||||
CONFIGURE_ARGS = -DSPIRV-Headers_SOURCE_DIR="${LOCALBASE}"
|
||||
|
||||
# effcee is missing to build tests
|
||||
NO_TEST = Yes
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (spirv-tools-2019.3.tar.gz) = V8WVhNgylKyRTBshUw+UQcKdMJeaVOXwqXsQcV3ELGQ=
|
||||
SIZE (spirv-tools-2019.3.tar.gz) = 1612835
|
||||
SHA256 (spirv-tools-2020.3.tar.gz) = i1OKHLKkJ175YXq8sEfVToKS+XWsHZMyPV3R4ZyFKAs=
|
||||
SIZE (spirv-tools-2020.3.tar.gz) = 2170858
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2019/06/22 15:24:31 thfr Exp $
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.2 2020/07/07 08:08:05 thfr Exp $
|
||||
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -50,6 +50,8 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Android")
|
||||
@@ -53,6 +53,8 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Android")
|
||||
set(SPIRV_TIMER_ENABLED ${SPIRV_ALLOW_TIMERS})
|
||||
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
|
||||
add_definitions(-DSPIRV_FREEBSD)
|
||||
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD")
|
||||
+ add_definitions(-DSPIRV_OPENBSD)
|
||||
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
|
||||
add_definitions(-DSPIRV_FUCHSIA)
|
||||
else()
|
||||
message(FATAL_ERROR "Your platform '${CMAKE_SYSTEM_NAME}' is not supported!")
|
||||
endif()
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-external_CMakeLists_txt,v 1.1.1.1 2019/06/22 15:24:31 thfr Exp $
|
||||
|
||||
Index: external/CMakeLists.txt
|
||||
--- external/CMakeLists.txt.orig
|
||||
+++ external/CMakeLists.txt
|
||||
@@ -19,7 +19,7 @@ if (DEFINED SPIRV-Headers_SOURCE_DIR)
|
||||
else()
|
||||
if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Headers)
|
||||
set(SPIRV_HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Headers)
|
||||
- else()
|
||||
+ elseif(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spirv-headers)
|
||||
set(SPIRV_HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/spirv-headers)
|
||||
endif()
|
||||
endif()
|
||||
13
graphics/spirv-tools/patches/patch-source_CMakeLists_txt
Normal file
13
graphics/spirv-tools/patches/patch-source_CMakeLists_txt
Normal file
@ -0,0 +1,13 @@
|
||||
$OpenBSD: patch-source_CMakeLists_txt,v 1.1 2020/07/07 08:08:05 thfr Exp $
|
||||
|
||||
Index: source/CMakeLists.txt
|
||||
--- source/CMakeLists.txt.orig
|
||||
+++ source/CMakeLists.txt
|
||||
@@ -347,6 +347,7 @@ spvtools_pch(SPIRV_SOURCES pch_source)
|
||||
|
||||
add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES})
|
||||
spvtools_default_compile_options(${SPIRV_TOOLS})
|
||||
+target_include_directories(${SPIRV_TOOLS} BEFORE PRIVATE ${spirv-tools_SOURCE_DIR}/include)
|
||||
target_include_directories(${SPIRV_TOOLS}
|
||||
PUBLIC
|
||||
$<BUILD_INTERFACE:${spirv-tools_SOURCE_DIR}/include>
|
||||
@ -1,14 +1,15 @@
|
||||
$OpenBSD: patch-source_print_cpp,v 1.1.1.1 2019/06/22 15:24:31 thfr Exp $
|
||||
$OpenBSD: patch-source_print_cpp,v 1.2 2020/07/07 08:08:05 thfr Exp $
|
||||
|
||||
Index: source/print.cpp
|
||||
--- source/print.cpp.orig
|
||||
+++ source/print.cpp
|
||||
@@ -15,7 +15,7 @@
|
||||
#include "source/print.h"
|
||||
@@ -16,7 +16,8 @@
|
||||
|
||||
#if defined(SPIRV_ANDROID) || defined(SPIRV_LINUX) || defined(SPIRV_MAC) || \
|
||||
- defined(SPIRV_FREEBSD)
|
||||
+ defined(SPIRV_FREEBSD) || defined(SPIRV_OPENBSD)
|
||||
defined(SPIRV_IOS) || defined(SPIRV_FREEBSD) || \
|
||||
- defined(SPIRV_EMSCRIPTEN) || defined(SPIRV_FUCHSIA)
|
||||
+ defined(SPIRV_EMSCRIPTEN) || defined(SPIRV_FUCHSIA) || \
|
||||
+ defined(SPIRV_OPENBSD)
|
||||
namespace spvtools {
|
||||
|
||||
clr::reset::operator const char*() { return "\x1b[0m"; }
|
||||
|
||||
15
graphics/spirv-tools/patches/patch-tools_CMakeLists_txt
Normal file
15
graphics/spirv-tools/patches/patch-tools_CMakeLists_txt
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-tools_CMakeLists_txt,v 1.1 2020/07/07 08:08:05 thfr Exp $
|
||||
|
||||
prefer local include/spirv-tools over system includes from earlier version
|
||||
|
||||
Index: tools/CMakeLists.txt
|
||||
--- tools/CMakeLists.txt.orig
|
||||
+++ tools/CMakeLists.txt
|
||||
@@ -53,6 +53,7 @@ if (NOT ${SPIRV_SKIP_EXECUTABLES})
|
||||
cfg/bin_to_dot.h
|
||||
cfg/bin_to_dot.cpp
|
||||
LIBS ${SPIRV_TOOLS})
|
||||
+ target_include_directories(spirv-cfg BEFORE PRIVATE ${spirv-tools_SOURCE_DIR}/include)
|
||||
target_include_directories(spirv-cfg PRIVATE ${spirv-tools_SOURCE_DIR}
|
||||
${SPIRV_HEADER_INCLUDE_DIR})
|
||||
set(SPIRV_INSTALL_TARGETS spirv-as spirv-dis spirv-val spirv-opt
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/06/22 15:24:31 thfr Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2020/07/07 08:08:05 thfr Exp $
|
||||
@bin bin/spirv-as
|
||||
@bin bin/spirv-cfg
|
||||
@bin bin/spirv-dis
|
||||
@ -6,7 +6,6 @@ bin/spirv-lesspipe.sh
|
||||
@bin bin/spirv-link
|
||||
@bin bin/spirv-opt
|
||||
@bin bin/spirv-reduce
|
||||
@bin bin/spirv-stats
|
||||
@bin bin/spirv-val
|
||||
include/spirv-tools/
|
||||
include/spirv-tools/instrument.hpp
|
||||
@ -14,10 +13,27 @@ 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-reduce.a
|
||||
lib/libSPIRV-Tools-shared.so
|
||||
lib/libSPIRV-Tools.a
|
||||
lib/cmake/
|
||||
lib/cmake/SPIRV-Tools/
|
||||
lib/cmake/SPIRV-Tools-link/
|
||||
lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkConfig.cmake
|
||||
lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets${MODCMAKE_BUILD_SUFFIX}
|
||||
lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets.cmake
|
||||
lib/cmake/SPIRV-Tools-opt/
|
||||
lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optConfig.cmake
|
||||
lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets${MODCMAKE_BUILD_SUFFIX}
|
||||
lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake
|
||||
lib/cmake/SPIRV-Tools-reduce/
|
||||
lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceConfig.cmake
|
||||
lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget${MODCMAKE_BUILD_SUFFIX}
|
||||
lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget.cmake
|
||||
lib/cmake/SPIRV-Tools/SPIRV-ToolsConfig.cmake
|
||||
lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget${MODCMAKE_BUILD_SUFFIX}
|
||||
lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake
|
||||
@static-lib lib/libSPIRV-Tools-link.a
|
||||
@static-lib lib/libSPIRV-Tools-opt.a
|
||||
@static-lib lib/libSPIRV-Tools-reduce.a
|
||||
@so lib/libSPIRV-Tools-shared.so
|
||||
@static-lib lib/libSPIRV-Tools.a
|
||||
lib/pkgconfig/SPIRV-Tools-shared.pc
|
||||
lib/pkgconfig/SPIRV-Tools.pc
|
||||
|
||||
@ -1,13 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.3 2019/06/22 17:12:27 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.4 2020/07/07 08:08:06 thfr Exp $
|
||||
|
||||
COMMENT = Vulkan header files
|
||||
|
||||
V = 1.1.108.0
|
||||
V = 1.2.141.0
|
||||
PKGNAME = vulkan-headers-${V}
|
||||
GH_TAGNAME = sdk-${V}
|
||||
GH_ACCOUNT = KhronosGroup
|
||||
GH_PROJECT = Vulkan-Headers
|
||||
REVISION = 0
|
||||
|
||||
CATEGORIES = devel graphics
|
||||
|
||||
@ -19,6 +18,7 @@ PERMIT_PACKAGE = Yes
|
||||
|
||||
MODULES = devel/cmake
|
||||
|
||||
NO_BUILD = Yes
|
||||
NO_TEST = Yes
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (Vulkan-Headers-sdk-1.1.108.0.tar.gz) = lE6IkR5H5dNLxDYOPlgzoNVQ4+dIPfonpfTThSWhuUM=
|
||||
SIZE (Vulkan-Headers-sdk-1.1.108.0.tar.gz) = 580538
|
||||
SHA256 (Vulkan-Headers-sdk-1.2.141.0.tar.gz) = V50RJDPImsikqTdBv6bu6NykodgUU2OijW2ZZ7q8Kwc=
|
||||
SIZE (Vulkan-Headers-sdk-1.2.141.0.tar.gz) = 756346
|
||||
|
||||
@ -0,0 +1,59 @@
|
||||
$OpenBSD: patch-include_vulkan_vulkan_hpp,v 1.1 2020/07/07 08:08:06 thfr Exp $
|
||||
|
||||
Index: include/vulkan/vulkan.hpp
|
||||
--- include/vulkan/vulkan.hpp.orig
|
||||
+++ include/vulkan/vulkan.hpp
|
||||
@@ -66,7 +66,7 @@
|
||||
#endif
|
||||
|
||||
#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
|
||||
-# if defined(__linux__) || defined(__APPLE__)
|
||||
+# if defined(__unix__) || defined(__APPLE__)
|
||||
# include <dlfcn.h>
|
||||
# endif
|
||||
#endif
|
||||
@@ -83744,7 +83744,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
{
|
||||
if ( !vulkanLibraryName.empty() )
|
||||
{
|
||||
-# if defined( __linux__ ) || defined( __APPLE__ )
|
||||
+# if defined( __unix__ ) || defined( __APPLE__ )
|
||||
m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL );
|
||||
# elif defined( _WIN32 )
|
||||
m_library = detail::LoadLibraryA( vulkanLibraryName.c_str() );
|
||||
@@ -83754,7 +83754,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
}
|
||||
else
|
||||
{
|
||||
-# if defined( __linux__ )
|
||||
+# if defined( __unix__ )
|
||||
m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL );
|
||||
if ( m_library == nullptr )
|
||||
{
|
||||
@@ -83801,7 +83801,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
{
|
||||
if ( m_library )
|
||||
{
|
||||
-# if defined( __linux__ ) || defined( __APPLE__ )
|
||||
+# if defined( __unix__ ) || defined( __APPLE__ )
|
||||
dlclose( m_library );
|
||||
# elif defined( _WIN32 )
|
||||
detail::FreeLibrary( m_library );
|
||||
@@ -83814,7 +83814,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
template <typename T>
|
||||
T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT
|
||||
{
|
||||
-# if defined( __linux__ ) || defined( __APPLE__ )
|
||||
+# if defined( __unix__ ) || defined( __APPLE__ )
|
||||
return (T)dlsym( m_library, function );
|
||||
# elif defined( _WIN32 )
|
||||
return (T)detail::GetProcAddress( m_library, function );
|
||||
@@ -83827,7 +83827,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
|
||||
private:
|
||||
bool m_success;
|
||||
-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( _WIN32 )
|
||||
+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( _WIN32 )
|
||||
void * m_library;
|
||||
# else
|
||||
# error unsupported platform
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-registry_cgenerator_py,v 1.1.1.1 2019/06/22 15:26:43 thfr Exp $
|
||||
$OpenBSD: patch-registry_cgenerator_py,v 1.2 2020/07/07 08:08:06 thfr Exp $
|
||||
|
||||
Index: registry/cgenerator.py
|
||||
--- registry/cgenerator.py.orig
|
||||
@ -7,5 +7,5 @@ Index: registry/cgenerator.py
|
||||
-#!/usr/bin/python3 -i
|
||||
+#!/usr/bin/env python3 -i
|
||||
#
|
||||
# Copyright (c) 2013-2019 The Khronos Group Inc.
|
||||
# Copyright (c) 2013-2020 The Khronos Group Inc.
|
||||
#
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-registry_conventions_py,v 1.1.1.1 2019/06/22 15:26:43 thfr Exp $
|
||||
$OpenBSD: patch-registry_conventions_py,v 1.2 2020/07/07 08:08:06 thfr Exp $
|
||||
|
||||
Index: registry/conventions.py
|
||||
--- registry/conventions.py.orig
|
||||
@ -7,5 +7,5 @@ Index: registry/conventions.py
|
||||
-#!/usr/bin/python3 -i
|
||||
+#!/usr/bin/env python3 -i
|
||||
#
|
||||
# Copyright (c) 2013-2019 The Khronos Group Inc.
|
||||
# Copyright (c) 2013-2020 The Khronos Group Inc.
|
||||
#
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-registry_generator_py,v 1.1.1.1 2019/06/22 15:26:43 thfr Exp $
|
||||
$OpenBSD: patch-registry_generator_py,v 1.2 2020/07/07 08:08:06 thfr Exp $
|
||||
|
||||
Index: registry/generator.py
|
||||
--- registry/generator.py.orig
|
||||
@ -7,5 +7,5 @@ Index: registry/generator.py
|
||||
-#!/usr/bin/python3 -i
|
||||
+#!/usr/bin/env python3 -i
|
||||
#
|
||||
# Copyright (c) 2013-2019 The Khronos Group Inc.
|
||||
# Copyright (c) 2013-2020 The Khronos Group Inc.
|
||||
#
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-registry_genvk_py,v 1.1.1.1 2019/06/22 15:26:43 thfr Exp $
|
||||
$OpenBSD: patch-registry_genvk_py,v 1.2 2020/07/07 08:08:06 thfr Exp $
|
||||
|
||||
Index: registry/genvk.py
|
||||
--- registry/genvk.py.orig
|
||||
@ -7,5 +7,5 @@ Index: registry/genvk.py
|
||||
-#!/usr/bin/python3
|
||||
+#!/usr/bin/env python3
|
||||
#
|
||||
# Copyright (c) 2013-2019 The Khronos Group Inc.
|
||||
# Copyright (c) 2013-2020 The Khronos Group Inc.
|
||||
#
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-registry_reg_py,v 1.1.1.1 2019/06/22 15:26:43 thfr Exp $
|
||||
$OpenBSD: patch-registry_reg_py,v 1.2 2020/07/07 08:08:06 thfr Exp $
|
||||
|
||||
Index: registry/reg.py
|
||||
--- registry/reg.py.orig
|
||||
@ -7,5 +7,5 @@ Index: registry/reg.py
|
||||
-#!/usr/bin/python3 -i
|
||||
+#!/usr/bin/env python3 -i
|
||||
#
|
||||
# Copyright (c) 2013-2019 The Khronos Group Inc.
|
||||
# Copyright (c) 2013-2020 The Khronos Group Inc.
|
||||
#
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-registry_vkconventions_py,v 1.1.1.1 2019/06/22 15:26:43 thfr Exp $
|
||||
$OpenBSD: patch-registry_vkconventions_py,v 1.2 2020/07/07 08:08:06 thfr Exp $
|
||||
|
||||
Index: registry/vkconventions.py
|
||||
--- registry/vkconventions.py.orig
|
||||
@ -7,5 +7,5 @@ Index: registry/vkconventions.py
|
||||
-#!/usr/bin/python3 -i
|
||||
+#!/usr/bin/env python3 -i
|
||||
#
|
||||
# Copyright (c) 2013-2019 The Khronos Group Inc.
|
||||
# Copyright (c) 2013-2020 The Khronos Group Inc.
|
||||
#
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/06/22 15:26:43 thfr Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2020/07/07 08:08:06 thfr Exp $
|
||||
include/vulkan/
|
||||
include/vulkan/vk_icd.h
|
||||
include/vulkan/vk_layer.h
|
||||
@ -7,6 +7,7 @@ include/vulkan/vk_sdk_platform.h
|
||||
include/vulkan/vulkan.h
|
||||
include/vulkan/vulkan.hpp
|
||||
include/vulkan/vulkan_android.h
|
||||
include/vulkan/vulkan_beta.h
|
||||
include/vulkan/vulkan_core.h
|
||||
include/vulkan/vulkan_fuchsia.h
|
||||
include/vulkan/vulkan_ggp.h
|
||||
@ -26,6 +27,8 @@ share/vulkan/registry/conventions.py
|
||||
share/vulkan/registry/generator.py
|
||||
share/vulkan/registry/genvk.py
|
||||
share/vulkan/registry/reg.py
|
||||
share/vulkan/registry/spec_tools/
|
||||
share/vulkan/registry/spec_tools/util.py
|
||||
share/vulkan/registry/validusage.json
|
||||
share/vulkan/registry/vk.xml
|
||||
share/vulkan/registry/vkconventions.py
|
||||
|
||||
@ -1,15 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.6 2020/05/03 22:37:29 jsg Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 2020/07/07 08:08:06 thfr Exp $
|
||||
|
||||
COMMENT = Vulkan ICD loader
|
||||
|
||||
V = 1.1.108.0
|
||||
V = 1.2.141.0
|
||||
PKGNAME = vulkan-loader-${V}
|
||||
GH_TAGNAME = sdk-${V}
|
||||
GH_ACCOUNT = KhronosGroup
|
||||
GH_PROJECT = Vulkan-Loader
|
||||
REVISION = 0
|
||||
|
||||
SHARED_LIBS += vulkan 0.0 # 1.1
|
||||
SHARED_LIBS += vulkan 0.1 # 1.2
|
||||
|
||||
CATEGORIES = devel graphics
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (Vulkan-Loader-sdk-1.1.108.0.tar.gz) = z4yJZbUd20zJBdT3NwMk3lThc2ao36+WwKki6cMtOBc=
|
||||
SIZE (Vulkan-Loader-sdk-1.1.108.0.tar.gz) = 1342959
|
||||
SHA256 (Vulkan-Loader-sdk-1.2.141.0.tar.gz) = N2La2GrHPu/lpPhhsQ/THzIxjJiKCG2eLpW9bsgNfhU=
|
||||
SIZE (Vulkan-Loader-sdk-1.2.141.0.tar.gz) = 1410533
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.2 2019/06/22 17:02:24 ajacoutot Exp $
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.3 2020/07/07 08:08:07 thfr Exp $
|
||||
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -77,13 +77,13 @@ set(LOADER_HELPER_FOLDER "Helper Targets")
|
||||
@@ -98,13 +98,13 @@ set(LOADER_HELPER_FOLDER "Helper Targets")
|
||||
|
||||
if(UNIX)
|
||||
set(
|
||||
@ -19,7 +19,7 @@ Index: CMakeLists.txt
|
||||
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."
|
||||
@@ -97,6 +97,7 @@ if(UNIX AND NOT APPLE) # i.e.: Linux
|
||||
@@ -124,6 +124,7 @@ if(UNIX AND NOT APPLE) # i.e.: Linux
|
||||
|
||||
if(BUILD_WSI_XCB_SUPPORT)
|
||||
find_package(XCB REQUIRED)
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
$OpenBSD: patch-loader_CMakeLists_txt,v 1.3 2020/05/03 22:37:29 jsg Exp $
|
||||
$OpenBSD: patch-loader_CMakeLists_txt,v 1.4 2020/07/07 08:08:07 thfr Exp $
|
||||
|
||||
Avoid vulkan-validation-layers vk_loader_platform.h being used.
|
||||
don't define _XOPEN_SOURCE=500, otherwise alloca from stdlib.h isn't
|
||||
visible and libvulkan won't run
|
||||
|
||||
Index: loader/CMakeLists.txt
|
||||
--- loader/CMakeLists.txt.orig
|
||||
@ -9,17 +10,34 @@ Index: loader/CMakeLists.txt
|
||||
# limitations under the License.
|
||||
# ~~~
|
||||
|
||||
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_BINARY_DIR} ${CMAKE_BINARY_DIR})
|
||||
+include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_BINARY_DIR} ${CMAKE_BINARY_DIR})
|
||||
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/generated ${CMAKE_CURRENT_BINARY_DIR})
|
||||
+include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/generated ${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
# Check for the existance of the secure_getenv or __secure_getenv commands
|
||||
include(CheckFunctionExists)
|
||||
@@ -247,7 +247,7 @@ else()
|
||||
"1"
|
||||
VERSION
|
||||
"${VulkanHeaders_VERSION_MAJOR}.${VulkanHeaders_VERSION_MINOR}.${VulkanHeaders_VERSION_PATCH}")
|
||||
- target_link_libraries(vulkan -ldl -lpthread -lm)
|
||||
+ target_link_libraries(vulkan -lpthread -lm)
|
||||
target_link_libraries(vulkan Vulkan::Headers)
|
||||
@@ -170,7 +170,6 @@ else(UNIX AND NOT APPLE) # i.e.: Linux
|
||||
target_link_libraries(asm_offset Vulkan::Headers)
|
||||
add_custom_command(OUTPUT gen_defines.asm DEPENDS asm_offset COMMAND asm_offset GAS)
|
||||
add_custom_target(loader_asm_gen_files DEPENDS gen_defines.asm)
|
||||
- target_compile_definitions(asm_offset PRIVATE _XOPEN_SOURCE=500) # hush compiler warnings for readlink
|
||||
else()
|
||||
message(WARNING "Could not find working x86 GAS assembler\n${ASM_FAILURE_MSG}")
|
||||
set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain.c)
|
||||
@@ -264,7 +263,7 @@ else()
|
||||
add_library(vulkan-framework SHARED ${NORMAL_LOADER_SRCS} ${OPT_LOADER_SRCS} ${FRAMEWORK_HEADERS})
|
||||
endif()
|
||||
add_dependencies(vulkan-framework loader_asm_gen_files)
|
||||
- target_link_libraries(vulkan-framework -ldl -lpthread -lm "-framework CoreFoundation")
|
||||
+ target_link_libraries(vulkan-framework -lpthread -lm "-framework CoreFoundation")
|
||||
target_link_libraries(vulkan-framework Vulkan::Headers)
|
||||
|
||||
if(APPLE)
|
||||
# The FRAMEWORK_VERSION needs to be "A" here so that Xcode code-signing works when a user adds their framework to an Xcode
|
||||
@@ -290,8 +289,6 @@ else()
|
||||
endif()
|
||||
|
||||
if(NOT APPLE)
|
||||
- target_compile_definitions(vulkan PRIVATE _XOPEN_SOURCE=500) # hush compiler warnings for readlink
|
||||
-
|
||||
# Generate pkg-config file.
|
||||
include(FindPkgConfig QUIET)
|
||||
if(PKG_CONFIG_FOUND)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-loader_loader_c,v 1.1.1.1 2019/06/22 15:28:42 thfr Exp $
|
||||
$OpenBSD: patch-loader_loader_c,v 1.2 2020/07/07 08:08:07 thfr Exp $
|
||||
|
||||
revert commit ecb0b1e69fb2f4d3cae262e6da24c170ce62ae13 to attempt to
|
||||
fix vulkaninfo
|
||||
@ -6,16 +6,16 @@ fix vulkaninfo
|
||||
Index: loader/loader.c
|
||||
--- loader/loader.c.orig
|
||||
+++ loader/loader.c
|
||||
@@ -229,7 +229,7 @@ void *loader_device_heap_realloc(const struct loader_d
|
||||
@@ -242,7 +242,7 @@ void *loader_device_heap_realloc(const struct loader_d
|
||||
}
|
||||
|
||||
// Environment variables
|
||||
-#if defined(__linux__) || defined(__APPLE__)
|
||||
+#if defined(__linux__) || defined(__APPLE__) || 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
|
||||
@@ -6756,56 +6756,11 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_EnumerateDev
|
||||
static inline bool IsHighIntegrity() {
|
||||
return geteuid() != getuid() || getegid() != getgid();
|
||||
@@ -7236,56 +7236,11 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_EnumerateDev
|
||||
struct loader_extension_list all_exts = {0};
|
||||
struct loader_extension_list icd_exts = {0};
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-loader_trampoline_c,v 1.1.1.1 2019/06/22 15:28:42 thfr Exp $
|
||||
$OpenBSD: patch-loader_trampoline_c,v 1.2 2020/07/07 08:08:07 thfr Exp $
|
||||
|
||||
revert commit ecb0b1e69fb2f4d3cae262e6da24c170ce62ae13 to attempt to
|
||||
fix vulkaninfo
|
||||
@ -6,7 +6,7 @@ fix vulkaninfo
|
||||
Index: loader/trampoline.c
|
||||
--- loader/trampoline.c.orig
|
||||
+++ loader/trampoline.c
|
||||
@@ -778,17 +778,61 @@ LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumera
|
||||
@@ -801,17 +801,61 @@ LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumera
|
||||
VkExtensionProperties *pProperties) {
|
||||
VkResult res = VK_SUCCESS;
|
||||
struct loader_physical_device_tramp *phys_dev;
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
$OpenBSD: patch-loader_vk_loader_platform_h,v 1.1.1.1 2019/06/22 15:28:42 thfr Exp $
|
||||
$OpenBSD: patch-loader_vk_loader_platform_h,v 1.2 2020/07/07 08:08:07 thfr Exp $
|
||||
|
||||
stub loader_platform_executable_path()
|
||||
|
||||
Index: loader/vk_loader_platform.h
|
||||
--- loader/vk_loader_platform.h.orig
|
||||
@ -8,7 +10,18 @@ Index: loader/vk_loader_platform.h
|
||||
#include "vulkan/vk_sdk_platform.h"
|
||||
|
||||
-#if defined(__linux__) || defined(__APPLE__)
|
||||
+#if defined(__linux__) || defined(__APPLE__) || defined(__unix__)
|
||||
+#if defined(__unix__) || defined(__APPLE__)
|
||||
/* Linux-specific common code: */
|
||||
|
||||
// Headers:
|
||||
@@ -117,6 +117,10 @@ static inline char *loader_platform_executable_path(ch
|
||||
if (ret <= 0) return NULL;
|
||||
buffer[ret] = '\0';
|
||||
return buffer;
|
||||
+}
|
||||
+#elif defined(__OpenBSD__) // defined(__APPLE__)
|
||||
+static inline char *loader_platform_executable_path(char *buffer, size_t size) {
|
||||
+ return NULL;
|
||||
}
|
||||
#endif // defined (__APPLE__)
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.4 2020/07/03 21:11:09 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.5 2020/07/07 08:08:07 thfr Exp $
|
||||
|
||||
COMMENT = Vulkan Utilities and Tools
|
||||
|
||||
V = 1.1.108.0
|
||||
V = 1.2.141.0
|
||||
PKGNAME = vulkan-tools-${V}
|
||||
GH_TAGNAME = sdk-${V}
|
||||
GH_ACCOUNT = KhronosGroup
|
||||
@ -24,9 +24,7 @@ COMPILER = base-clang ports-gcc
|
||||
MODULES = devel/cmake \
|
||||
lang/python
|
||||
|
||||
# XXX needs updating for 3.8
|
||||
#MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
|
||||
MODPY_VERSION = 3.7
|
||||
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
|
||||
|
||||
MODPY_RUNDEP = No
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (Vulkan-Tools-sdk-1.1.108.0.tar.gz) = zZMlNG1TX8b9W2qws+UsjvkcrcU02NtylwB0Xxi6Vng=
|
||||
SIZE (Vulkan-Tools-sdk-1.1.108.0.tar.gz) = 615856
|
||||
SHA256 (Vulkan-Tools-sdk-1.2.141.0.tar.gz) = u638L6cuVfHc285eb/AQ7DsSQ8v2UsB03owqXpi0Js4=
|
||||
SIZE (Vulkan-Tools-sdk-1.2.141.0.tar.gz) = 711771
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-cube_cube_cpp,v 1.1.1.1 2019/06/22 15:30:16 thfr Exp $
|
||||
$OpenBSD: patch-cube_cube_cpp,v 1.2 2020/07/07 08:08:07 thfr Exp $
|
||||
|
||||
Index: cube/cube.cpp
|
||||
--- cube/cube.cpp.orig
|
||||
+++ cube/cube.cpp
|
||||
@@ -2975,7 +2975,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
|
||||
@@ -2998,7 +2998,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
|
||||
return (int)msg.wParam;
|
||||
}
|
||||
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-icd_CMakeLists_txt,v 1.1.1.1 2019/06/22 15:30:16 thfr Exp $
|
||||
$OpenBSD: patch-icd_CMakeLists_txt,v 1.2 2020/07/07 08:08:07 thfr Exp $
|
||||
|
||||
Index: icd/CMakeLists.txt
|
||||
--- icd/CMakeLists.txt.orig
|
||||
+++ icd/CMakeLists.txt
|
||||
@@ -38,6 +38,8 @@ elseif(APPLE)
|
||||
@@ -24,6 +24,8 @@ elseif(APPLE)
|
||||
elseif(UNIX AND NOT APPLE) # i.e. Linux
|
||||
if(BUILD_WSI_XCB_SUPPORT)
|
||||
add_definitions(-DVK_USE_PLATFORM_XCB_KHR -DVK_USE_PLATFORM_XCB_KHX)
|
||||
|
||||
56
graphics/vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h
Normal file
56
graphics/vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h
Normal file
@ -0,0 +1,56 @@
|
||||
$OpenBSD: patch-vulkaninfo_vulkaninfo_h,v 1.1 2020/07/07 08:08:07 thfr Exp $
|
||||
|
||||
Index: vulkaninfo/vulkaninfo.h
|
||||
--- vulkaninfo/vulkaninfo.h.orig
|
||||
+++ vulkaninfo/vulkaninfo.h
|
||||
@@ -60,7 +60,11 @@
|
||||
#include <windows.h>
|
||||
#endif // _WIN32
|
||||
|
||||
-#if defined(__linux__) || defined(__APPLE__)
|
||||
+#if defined(__unix__) && !defined(__APPLE__)
|
||||
+#define USE_DLOPEN 1
|
||||
+#endif
|
||||
+
|
||||
+#if defined(USE_DLOPEN)
|
||||
#include <dlfcn.h>
|
||||
#endif
|
||||
|
||||
@@ -253,8 +257,11 @@ auto GetVector(const char *func_name, F &&f, Ts &&...
|
||||
// ----------- Instance Setup ------- //
|
||||
struct VkDll {
|
||||
VkResult Initialize() {
|
||||
-#if defined(__linux__)
|
||||
+#if defined(__OpenBSD__)
|
||||
library = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
|
||||
+ if (!library) library = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
|
||||
+#elif defined(USE_DLOPEN)
|
||||
+ library = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
|
||||
if (!library) library = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL);
|
||||
#elif defined(_WIN32)
|
||||
library = LoadLibrary(TEXT("vulkan-1.dll"));
|
||||
@@ -265,7 +272,7 @@ struct VkDll {
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
void Close() {
|
||||
-#if defined(__linux__)
|
||||
+#if defined(USE_DLOPEN)
|
||||
dlclose(library);
|
||||
#elif defined(_WIN32)
|
||||
FreeLibrary(library);
|
||||
@@ -427,13 +434,13 @@ struct VkDll {
|
||||
private:
|
||||
template <typename T>
|
||||
void Load(T &func_dest, const char *func_name) {
|
||||
-#if defined(__linux__)
|
||||
+#if defined(USE_DLOPEN)
|
||||
func_dest = reinterpret_cast<T>(dlsym(library, func_name));
|
||||
#elif defined(_WIN32)
|
||||
func_dest = reinterpret_cast<T>(GetProcAddress(library, func_name));
|
||||
#endif
|
||||
}
|
||||
-#if defined(__linux__)
|
||||
+#if defined(USE_DLOPEN)
|
||||
void *library;
|
||||
#elif defined(_WIN32)
|
||||
HMODULE library;
|
||||
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.3 2019/08/16 15:31:23 thfr Exp $
|
||||
# $OpenBSD: Makefile,v 1.4 2020/07/07 08:08:07 thfr Exp $
|
||||
|
||||
COMMENT = Vulkan Validation Layers
|
||||
|
||||
V = 1.1.108.0
|
||||
V = 1.2.141.0
|
||||
PKGNAME = vulkan-validation-layers-${V}
|
||||
GH_TAGNAME = sdk-${V}
|
||||
GH_ACCOUNT = KhronosGroup
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (Vulkan-ValidationLayers-sdk-1.1.108.0.tar.gz) = fihiF8sOg6hrVj25w/lATYT738rNeXboZfYW6+z+WBE=
|
||||
SIZE (Vulkan-ValidationLayers-sdk-1.1.108.0.tar.gz) = 1187826
|
||||
SHA256 (Vulkan-ValidationLayers-sdk-1.2.141.0.tar.gz) = CgBvmh+ic8HFS9NOVEBkrAj1FTtEnT3YA/NukVpoGJ0=
|
||||
SIZE (Vulkan-ValidationLayers-sdk-1.2.141.0.tar.gz) = 2048159
|
||||
|
||||
@ -1,12 +1,9 @@
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2019/06/22 15:32:36 thfr Exp $
|
||||
|
||||
bundled headers should go before system headers which may be from old
|
||||
version (VulkanHeaders_INCLUDE_DIR is picked up as /usr/local/include)
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.2 2020/07/07 08:08:08 thfr Exp $
|
||||
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -90,6 +90,7 @@ if(UNIX AND NOT APPLE) # i.e. Linux
|
||||
@@ -95,6 +95,7 @@ if(UNIX AND NOT APPLE) # i.e. Linux
|
||||
|
||||
if(BUILD_WSI_XCB_SUPPORT)
|
||||
find_package(XCB REQUIRED)
|
||||
@ -14,18 +11,3 @@ Index: CMakeLists.txt
|
||||
endif()
|
||||
|
||||
if(BUILD_WSI_XLIB_SUPPORT)
|
||||
@@ -344,11 +345,11 @@ install(TARGETS VkLayer_utils DESTINATION ${CMAKE_INST
|
||||
set_target_properties(VkLayer_utils PROPERTIES LINKER_LANGUAGE CXX)
|
||||
add_dependencies(VkLayer_utils VulkanVL_generate_helper_files)
|
||||
target_include_directories(VkLayer_utils
|
||||
- PUBLIC ${VulkanHeaders_INCLUDE_DIR}
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/layers
|
||||
+ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/layers
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_CURRENT_BINARY_DIR}/layers
|
||||
- ${PROJECT_BINARY_DIR})
|
||||
+ ${PROJECT_BINARY_DIR}
|
||||
+ ${VulkanHeaders_INCLUDE_DIR})
|
||||
|
||||
# uninstall target ---------------------------------------------------------------------------------------------------------------
|
||||
if(NOT TARGET uninstall)
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
$OpenBSD: patch-layers_CMakeLists_txt,v 1.1.1.1 2019/06/22 15:32:36 thfr Exp $
|
||||
$OpenBSD: patch-layers_CMakeLists_txt,v 1.2 2020/07/07 08:08:08 thfr Exp $
|
||||
|
||||
include build dir before VulkanHeaders_INCLUDE_DIR
|
||||
|
||||
Index: layers/CMakeLists.txt
|
||||
--- layers/CMakeLists.txt.orig
|
||||
+++ layers/CMakeLists.txt
|
||||
@@ -152,7 +152,7 @@ else(UNIX AND NOT APPLE) # i.e.: Linux
|
||||
@@ -137,7 +137,7 @@ else(UNIX AND NOT APPLE) # i.e.: Linux
|
||||
endmacro()
|
||||
endif()
|
||||
|
||||
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${VulkanHeaders_INCLUDE_DIR})
|
||||
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_BINARY_DIR} ${VulkanHeaders_INCLUDE_DIR})
|
||||
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/generated ${VulkanHeaders_INCLUDE_DIR})
|
||||
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/generated ${VulkanHeaders_INCLUDE_DIR})
|
||||
|
||||
if(WIN32)
|
||||
# Applies to all configurations
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-layers_vk_loader_platform_h,v 1.1.1.1 2019/06/22 15:32:36 thfr Exp $
|
||||
$OpenBSD: patch-layers_vk_loader_platform_h,v 1.2 2020/07/07 08:08:08 thfr Exp $
|
||||
|
||||
Index: layers/vk_loader_platform.h
|
||||
--- layers/vk_loader_platform.h.orig
|
||||
+++ layers/vk_loader_platform.h
|
||||
@@ -31,7 +31,7 @@
|
||||
#include "vulkan/vk_platform.h"
|
||||
@@ -33,7 +33,7 @@
|
||||
#undef NOMINMAX
|
||||
#include "vulkan/vk_sdk_platform.h"
|
||||
|
||||
-#if defined(__linux__) || defined(__APPLE__)
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-layers_vk_mem_alloc_h,v 1.1.1.1 2019/06/22 15:32:36 thfr Exp $
|
||||
$OpenBSD: patch-layers_vk_mem_alloc_h,v 1.2 2020/07/07 08:08:08 thfr Exp $
|
||||
|
||||
Index: layers/vk_mem_alloc.h
|
||||
--- layers/vk_mem_alloc.h.orig
|
||||
+++ layers/vk_mem_alloc.h
|
||||
@@ -3179,7 +3179,7 @@ void *aligned_alloc(size_t alignment, size_t size)
|
||||
@@ -3180,7 +3180,7 @@ void *aligned_alloc(size_t alignment, size_t size)
|
||||
|
||||
return memalign(alignment, size);
|
||||
}
|
||||
|
||||
@ -1,41 +1,6 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/06/22 15:32:36 thfr Exp $
|
||||
include/cast_utils.h
|
||||
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_khronos_validation.so
|
||||
lib/libVkLayer_object_lifetimes.so
|
||||
lib/libVkLayer_stateless_validation.so
|
||||
lib/libVkLayer_thread_safety.so
|
||||
lib/libVkLayer_unique_objects.so
|
||||
lib/libVkLayer_utils.a
|
||||
@comment $OpenBSD: PLIST,v 1.2 2020/07/07 08:08:08 thfr Exp $
|
||||
@so lib/libVkLayer_khronos_validation.so
|
||||
@static-lib lib/libVkLayer_utils.a
|
||||
share/vulkan/
|
||||
share/vulkan/explicit_layer.d/
|
||||
share/vulkan/explicit_layer.d/VkLayer_core_validation.json
|
||||
share/vulkan/explicit_layer.d/VkLayer_khronos_validation.json
|
||||
share/vulkan/explicit_layer.d/VkLayer_object_lifetimes.json
|
||||
share/vulkan/explicit_layer.d/VkLayer_standard_validation.json
|
||||
share/vulkan/explicit_layer.d/VkLayer_stateless_validation.json
|
||||
share/vulkan/explicit_layer.d/VkLayer_thread_safety.json
|
||||
share/vulkan/explicit_layer.d/VkLayer_unique_objects.json
|
||||
|
||||
Loading…
Reference in New Issue
Block a user