Hi, This diff updates the vulkan ports to the latest SDK from a few weeks ago. Besides now needing graphics/volk (already imported) and vulkan-utility-libraries (see separate email to ports@), the update is pretty much the usual churn.
I tested it on my Intel Tigerlake system with vkcube, vkcubepp, and vulkaninfo (all from vulkan-tools package), as well as with games/vkquake without issues. This includes runs with the validation layers enabled. Note if you want to test the validation layers, the previous VK_INSTANCE_LAYER env var is now deprecated in favor of VK_LOADER_LAYERS_ENABLE with a different syntax, see: https://vulkan.lunarg.com/doc/sdk/1.3.275.0/windows/layer_configuration.html (This is usually silent in normal working test cases in my experience.) Sending this now so that building/using volk and vulkan-utility-libraries can be tested. ok? Index: glslang/Makefile =================================================================== RCS file: /cvs/ports/graphics/glslang/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- glslang/Makefile 29 Nov 2023 22:56:00 -0000 1.22 +++ glslang/Makefile 24 Feb 2024 19:58:33 -0000 @@ -2,13 +2,13 @@ PORTROACH = limit:^[0-9] COMMENT = reference front-end for GLSL and ESSL -GH_TAGNAME = 13.0.0 +GH_TAGNAME = 14.0.0 GH_ACCOUNT = KhronosGroup GH_PROJECT = glslang -SHARED_LIBS += glslang 4.0 # 13.0 -SHARED_LIBS += HLSL 0.0 # 12.1 -SHARED_LIBS += SPIRV 3.0 # 13.0 +SHARED_LIBS += glslang 5.0 # 14.0 +SHARED_LIBS += glslang-default-resource-limits 0.0 # 14.0 +SHARED_LIBS += SPIRV 4.0 # 14.0 SHARED_LIBS += SPVRemapper 1.0 # 13.0 CATEGORIES = devel graphics @@ -26,10 +26,12 @@ COMPILER = base-clang ports-gcc MODULES = devel/cmake \ lang/python +BUILD_DEPENDS = graphics/spirv-tools TEST_DEPENDS = graphics/spirv-tools \ shells/bash -CONFIGURE_ARGS += -DBUILD_SHARED_LIBS=ON +CONFIGURE_ARGS += -DALLOW_EXTERNAL_SPIRV_TOOLS=ON \ + -DBUILD_SHARED_LIBS=ON SUBST_VARS += ADDITIONAL_LIBRARIES Index: glslang/distinfo =================================================================== RCS file: /cvs/ports/graphics/glslang/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- glslang/distinfo 5 Sep 2023 19:07:49 -0000 1.10 +++ glslang/distinfo 24 Feb 2024 19:58:33 -0000 @@ -1,2 +1,2 @@ -SHA256 (glslang-13.0.0.tar.gz) = vNpzJDT4Kap0QU6g4G0ynsisKGN8OKDeReF8j9JaRxU= -SIZE (glslang-13.0.0.tar.gz) = 3710806 +SHA256 (glslang-14.0.0.tar.gz) = gLu5FqI+lOqcv7GstdGkSn4MlhO89bWUfAPyJzvckrA= +SIZE (glslang-14.0.0.tar.gz) = 3770344 Index: glslang/patches/patch-StandAlone_CMakeLists_txt =================================================================== RCS file: /cvs/ports/graphics/glslang/patches/patch-StandAlone_CMakeLists_txt,v retrieving revision 1.1 diff -u -p -r1.1 patch-StandAlone_CMakeLists_txt --- glslang/patches/patch-StandAlone_CMakeLists_txt 29 Nov 2023 22:56:00 -0000 1.1 +++ glslang/patches/patch-StandAlone_CMakeLists_txt 24 Feb 2024 19:58:33 -0000 @@ -3,7 +3,7 @@ Hack to inject -lstdc++fs for lang/gcc Index: StandAlone/CMakeLists.txt --- StandAlone/CMakeLists.txt.orig +++ StandAlone/CMakeLists.txt -@@ -62,7 +62,7 @@ if(WIN32) +@@ -67,7 +67,7 @@ if(WIN32) set(LIBRARIES ${LIBRARIES} psapi) elseif(UNIX) if(NOT ANDROID AND NOT QNX) Index: glslang/pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/glslang/pkg/PLIST,v retrieving revision 1.10 diff -u -p -r1.10 PLIST --- glslang/pkg/PLIST 2 Aug 2023 21:18:17 -0000 1.10 +++ glslang/pkg/PLIST 24 Feb 2024 19:58:33 -0000 @@ -2,77 +2,24 @@ bin/glslangValidator @bin bin/spirv-remap include/glslang/ -include/glslang/HLSL/ -include/glslang/HLSL/hlslAttributes.h -include/glslang/HLSL/hlslGrammar.h -include/glslang/HLSL/hlslOpMap.h -include/glslang/HLSL/hlslParseHelper.h -include/glslang/HLSL/hlslParseables.h -include/glslang/HLSL/hlslScanContext.h -include/glslang/HLSL/hlslTokenStream.h -include/glslang/HLSL/hlslTokens.h include/glslang/Include/ -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/SpirvIntrinsics.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/MachineIndependent/ -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/ -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/ include/glslang/Public/ResourceLimits.h include/glslang/Public/ShaderLang.h include/glslang/Public/resource_limits_c.h include/glslang/SPIRV/ -include/glslang/SPIRV/GLSL.ext.AMD.h -include/glslang/SPIRV/GLSL.ext.ARM.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/NonSemanticShaderDebugInfo100.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 include/glslang/build_info.h lib/cmake/ -lib/cmake/HLSLTargets.cmake lib/cmake/SPIRVTargets.cmake lib/cmake/SPVRemapperTargets.cmake lib/cmake/glslang/ @@ -83,8 +30,7 @@ lib/cmake/glslang/glslang-config.cmake lib/cmake/glslang/glslang-targets${MODCMAKE_BUILD_SUFFIX} lib/cmake/glslang/glslang-targets.cmake lib/cmake/spirv-remapTargets.cmake -@lib lib/libHLSL.so.${LIBHLSL_VERSION} @lib lib/libSPIRV.so.${LIBSPIRV_VERSION} @lib lib/libSPVRemapper.so.${LIBSPVRemapper_VERSION} -@static-lib lib/libglslang-default-resource-limits.a +@lib lib/libglslang-default-resource-limits.so.${LIBglslang-default-resource-limits_VERSION} @lib lib/libglslang.so.${LIBglslang_VERSION} Index: spirv-headers/Makefile =================================================================== RCS file: /cvs/ports/graphics/spirv-headers/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- spirv-headers/Makefile 5 Sep 2023 19:07:49 -0000 1.14 +++ spirv-headers/Makefile 24 Feb 2024 19:58:33 -0000 @@ -1,10 +1,10 @@ COMMENT = SPIRV-Headers -V = 1.3.261.1 +V = 1.3.275.0 DISTNAME = spirv-headers-${V} GH_ACCOUNT = KhronosGroup GH_PROJECT = SPIRV-Headers -GH_TAGNAME = sdk-${V} +GH_TAGNAME = vulkan-sdk-${V} EPOCH = 0 CATEGORIES = devel graphics Index: spirv-headers/distinfo =================================================================== RCS file: /cvs/ports/graphics/spirv-headers/distinfo,v retrieving revision 1.12 diff -u -p -r1.12 distinfo --- spirv-headers/distinfo 5 Sep 2023 19:07:49 -0000 1.12 +++ spirv-headers/distinfo 24 Feb 2024 19:58:33 -0000 @@ -1,2 +1,2 @@ -SHA256 (spirv-headers-1.3.261.1.tar.gz) = MrTGrmovqbVsLBcjPIBW2kfjMfduEXcpklgl6j53pzk= -SIZE (spirv-headers-1.3.261.1.tar.gz) = 456157 +SHA256 (spirv-headers-1.3.275.0.tar.gz) = 1GsmHx+8XoUCLLL62ppvrLWwyZMrRQB6d/4FY5pgW9E= +SIZE (spirv-headers-1.3.275.0.tar.gz) = 466358 Index: spirv-tools/Makefile =================================================================== RCS file: /cvs/ports/graphics/spirv-tools/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- spirv-tools/Makefile 5 Sep 2023 19:07:49 -0000 1.17 +++ spirv-tools/Makefile 24 Feb 2024 19:58:33 -0000 @@ -1,10 +1,10 @@ COMMENT = API and commands for processing SPIR-V -V = 1.3.261.1 +V = 1.3.275.0 DISTNAME = spirv-tools-${V} GH_ACCOUNT = KhronosGroup GH_PROJECT = SPIRV-Tools -GH_TAGNAME = sdk-${V} +GH_TAGNAME = vulkan-sdk-${V} EPOCH = 0 SHARED_LIBS += SPIRV-Tools-shared 0.0 # 1.3.261.1 Index: spirv-tools/distinfo =================================================================== RCS file: /cvs/ports/graphics/spirv-tools/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- spirv-tools/distinfo 5 Sep 2023 19:07:49 -0000 1.13 +++ spirv-tools/distinfo 24 Feb 2024 19:58:33 -0000 @@ -1,2 +1,2 @@ -SHA256 (spirv-tools-1.3.261.1.tar.gz) = 6tlcYmrUgogqFB0aoM5HuUU4cfcsQsCyjTnIL2ClIAg= -SIZE (spirv-tools-1.3.261.1.tar.gz) = 3140301 +SHA256 (spirv-tools-1.3.275.0.tar.gz) = 9v4y7cALc0AOnVR02H1HRHi/i8D7c9J2f+zYR8BaSx0= +SIZE (spirv-tools-1.3.275.0.tar.gz) = 3153781 Index: vulkan-headers/Makefile =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- vulkan-headers/Makefile 5 Sep 2023 19:07:49 -0000 1.15 +++ vulkan-headers/Makefile 24 Feb 2024 19:58:33 -0000 @@ -1,8 +1,8 @@ COMMENT = Vulkan header files -V = 1.3.261.1 +V = 1.3.275.0 PKGNAME = vulkan-headers-${V} -GH_TAGNAME = sdk-${V} +GH_TAGNAME = vulkan-sdk-${V} GH_ACCOUNT = KhronosGroup GH_PROJECT = Vulkan-Headers @@ -16,7 +16,6 @@ PERMIT_PACKAGE = Yes MODULES = devel/cmake -NO_BUILD = Yes NO_TEST = Yes .include <bsd.port.mk> Index: vulkan-headers/distinfo =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/distinfo,v retrieving revision 1.12 diff -u -p -r1.12 distinfo --- vulkan-headers/distinfo 5 Sep 2023 19:07:49 -0000 1.12 +++ vulkan-headers/distinfo 24 Feb 2024 19:58:33 -0000 @@ -1,2 +1,2 @@ -SHA256 (Vulkan-Headers-sdk-1.3.261.1.tar.gz) = eiXr22Ml5ibcXTO8k3sonMzn3bewrBobHV1/8ztnFdM= -SIZE (Vulkan-Headers-sdk-1.3.261.1.tar.gz) = 2046068 +SHA256 (Vulkan-Headers-vulkan-sdk-1.3.275.0.tar.gz) = /NITap/rBAKCCzNNgkJ3NGLMR+05eqIMj00E9+oY2BA= +SIZE (Vulkan-Headers-vulkan-sdk-1.3.275.0.tar.gz) = 2199831 Index: vulkan-headers/patches/patch-registry_apiconventions_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_apiconventions_py,v retrieving revision 1.2 diff -u -p -r1.2 patch-registry_apiconventions_py --- vulkan-headers/patches/patch-registry_apiconventions_py 13 May 2023 16:26:12 -0000 1.2 +++ vulkan-headers/patches/patch-registry_apiconventions_py 24 Feb 2024 19:58:33 -0000 @@ -5,5 +5,5 @@ Index: registry/apiconventions.py -#!/usr/bin/python3 -i +#!/usr/bin/env python3 -i # - # Copyright 2021-2023 The Khronos Group Inc. + # Copyright 2021-2024 The Khronos Group Inc. # SPDX-License-Identifier: Apache-2.0 Index: vulkan-headers/patches/patch-registry_cgenerator_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_cgenerator_py,v retrieving revision 1.6 diff -u -p -r1.6 patch-registry_cgenerator_py --- vulkan-headers/patches/patch-registry_cgenerator_py 13 May 2023 16:26:12 -0000 1.6 +++ vulkan-headers/patches/patch-registry_cgenerator_py 24 Feb 2024 19:58:33 -0000 @@ -5,5 +5,5 @@ Index: registry/cgenerator.py -#!/usr/bin/python3 -i +#!/usr/bin/env python3 -i # - # Copyright 2013-2023 The Khronos Group Inc. + # Copyright 2013-2024 The Khronos Group Inc. # Index: vulkan-headers/patches/patch-registry_generator_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_generator_py,v retrieving revision 1.6 diff -u -p -r1.6 patch-registry_generator_py --- vulkan-headers/patches/patch-registry_generator_py 13 May 2023 16:26:12 -0000 1.6 +++ vulkan-headers/patches/patch-registry_generator_py 24 Feb 2024 19:58:33 -0000 @@ -5,5 +5,5 @@ Index: registry/generator.py -#!/usr/bin/python3 -i +#!/usr/bin/env python3 -i # - # Copyright 2013-2023 The Khronos Group Inc. + # Copyright 2013-2024 The Khronos Group Inc. # Index: vulkan-headers/patches/patch-registry_genvk_py =================================================================== RCS file: vulkan-headers/patches/patch-registry_genvk_py diff -N vulkan-headers/patches/patch-registry_genvk_py --- vulkan-headers/patches/patch-registry_genvk_py 13 May 2023 16:26:12 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,9 +0,0 @@ -Index: registry/genvk.py ---- registry/genvk.py.orig -+++ registry/genvk.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python3 -+#!/usr/bin/env python3 - # - # Copyright 2013-2023 The Khronos Group Inc. - # Index: vulkan-headers/patches/patch-registry_reg_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_reg_py,v retrieving revision 1.7 diff -u -p -r1.7 patch-registry_reg_py --- vulkan-headers/patches/patch-registry_reg_py 13 May 2023 16:26:12 -0000 1.7 +++ vulkan-headers/patches/patch-registry_reg_py 24 Feb 2024 19:58:33 -0000 @@ -5,5 +5,5 @@ Index: registry/reg.py -#!/usr/bin/python3 -i +#!/usr/bin/env python3 -i # - # Copyright 2013-2023 The Khronos Group Inc. + # Copyright 2013-2024 The Khronos Group Inc. # Index: vulkan-headers/patches/patch-registry_spec_tools_conventions_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_spec_tools_conventions_py,v retrieving revision 1.2 diff -u -p -r1.2 patch-registry_spec_tools_conventions_py --- vulkan-headers/patches/patch-registry_spec_tools_conventions_py 13 May 2023 16:26:12 -0000 1.2 +++ vulkan-headers/patches/patch-registry_spec_tools_conventions_py 24 Feb 2024 19:58:33 -0000 @@ -5,5 +5,5 @@ Index: registry/spec_tools/conventions.p -#!/usr/bin/python3 -i +#!/usr/bin/env python3 -i # - # Copyright 2013-2023 The Khronos Group Inc. + # Copyright 2013-2024 The Khronos Group Inc. # Index: vulkan-headers/patches/patch-registry_vkconventions_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_vkconventions_py,v retrieving revision 1.6 diff -u -p -r1.6 patch-registry_vkconventions_py --- vulkan-headers/patches/patch-registry_vkconventions_py 13 May 2023 16:26:12 -0000 1.6 +++ vulkan-headers/patches/patch-registry_vkconventions_py 24 Feb 2024 19:58:33 -0000 @@ -5,5 +5,5 @@ Index: registry/vkconventions.py -#!/usr/bin/python3 -i +#!/usr/bin/env python3 -i # - # Copyright 2013-2023 The Khronos Group Inc. + # Copyright 2013-2024 The Khronos Group Inc. # Index: vulkan-headers/pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/pkg/PLIST,v retrieving revision 1.13 diff -u -p -r1.13 PLIST --- vulkan-headers/pkg/PLIST 5 Sep 2023 19:07:50 -0000 1.13 +++ vulkan-headers/pkg/PLIST 24 Feb 2024 19:58:33 -0000 @@ -25,11 +25,13 @@ include/vulkan/vulkan_funcs.hpp include/vulkan/vulkan_ggp.h include/vulkan/vulkan_handles.hpp include/vulkan/vulkan_hash.hpp +include/vulkan/vulkan_hpp_macros.hpp include/vulkan/vulkan_ios.h include/vulkan/vulkan_macos.h include/vulkan/vulkan_metal.h include/vulkan/vulkan_raii.hpp include/vulkan/vulkan_screen.h +include/vulkan/vulkan_shared.hpp include/vulkan/vulkan_static_assertions.hpp include/vulkan/vulkan_structs.hpp include/vulkan/vulkan_to_string.hpp @@ -49,7 +51,6 @@ share/vulkan/registry/ share/vulkan/registry/apiconventions.py share/vulkan/registry/cgenerator.py share/vulkan/registry/generator.py -share/vulkan/registry/genvk.py share/vulkan/registry/parse_dependency.py share/vulkan/registry/profiles/ share/vulkan/registry/profiles/VP_KHR_roadmap_2022.json Index: vulkan-loader/Makefile =================================================================== RCS file: /cvs/ports/graphics/vulkan-loader/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- vulkan-loader/Makefile 5 Sep 2023 19:07:50 -0000 1.22 +++ vulkan-loader/Makefile 24 Feb 2024 19:58:33 -0000 @@ -1,8 +1,8 @@ COMMENT = Vulkan ICD loader -V = 1.3.261.1 +V = 1.3.275.0 PKGNAME = vulkan-loader-${V} -GH_TAGNAME = sdk-${V} +GH_TAGNAME = vulkan-sdk-${V} GH_ACCOUNT = KhronosGroup GH_PROJECT = Vulkan-Loader @@ -21,11 +21,7 @@ WANTLIB += X11 xcb m pthread BUILD_DEPENDS = graphics/vulkan-headers RUN_DEPENDS = graphics/vulkan-headers -# XXX: building 1.3.261.1 with ENABLE_WERROR fails with -# vk_loader_platform.h:305:59: error: unused parameter 'buffer' -# [-Werror,-Wunused-parameter] CONFIGURE_ARGS =-DBUILD_WSI_WAYLAND_SUPPORT=False \ - -DENABLE_WERROR=False \ -DFALLBACK_CONFIG_DIRS="${SYSCONFDIR}/xdg" \ -DFALLBACK_DATA_DIRS="${X11BASE}/share:${LOCALBASE}/share:/usr/share" Index: vulkan-loader/distinfo =================================================================== RCS file: /cvs/ports/graphics/vulkan-loader/distinfo,v retrieving revision 1.12 diff -u -p -r1.12 distinfo --- vulkan-loader/distinfo 5 Sep 2023 19:07:50 -0000 1.12 +++ vulkan-loader/distinfo 24 Feb 2024 19:58:33 -0000 @@ -1,2 +1,2 @@ -SHA256 (Vulkan-Loader-sdk-1.3.261.1.tar.gz) = +F8OpXtjdQ1N2vbIZJ33gcR3cAbao813KwHnte0C8/I= -SIZE (Vulkan-Loader-sdk-1.3.261.1.tar.gz) = 1684764 +SHA256 (Vulkan-Loader-vulkan-sdk-1.3.275.0.tar.gz) = 9JomU81ZJDnFtLmH/6CyV3t/pyt9NE16Kon31ssrNC4= +SIZE (Vulkan-Loader-vulkan-sdk-1.3.275.0.tar.gz) = 1701620 Index: vulkan-loader/pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/vulkan-loader/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- vulkan-loader/pkg/PLIST 11 Mar 2022 19:23:30 -0000 1.2 +++ vulkan-loader/pkg/PLIST 24 Feb 2024 19:58:33 -0000 @@ -1,2 +1,7 @@ +lib/cmake/ +lib/cmake/VulkanLoader/ +lib/cmake/VulkanLoader/VulkanLoaderConfig${MODCMAKE_BUILD_SUFFIX} +lib/cmake/VulkanLoader/VulkanLoaderConfig.cmake +lib/cmake/VulkanLoader/VulkanLoaderConfigVersion.cmake @lib lib/libvulkan.so.${LIBvulkan_VERSION} lib/pkgconfig/vulkan.pc Index: vulkan-tools/Makefile =================================================================== RCS file: /cvs/ports/graphics/vulkan-tools/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- vulkan-tools/Makefile 5 Sep 2023 19:07:50 -0000 1.17 +++ vulkan-tools/Makefile 24 Feb 2024 19:58:33 -0000 @@ -1,8 +1,8 @@ COMMENT = Vulkan Utilities and Tools -V = 1.3.261.1 +V = 1.3.275.0 PKGNAME = vulkan-tools-${V} -GH_TAGNAME = sdk-${V} +GH_TAGNAME = vulkan-sdk-${V} GH_ACCOUNT = KhronosGroup GH_PROJECT = Vulkan-Tools @@ -14,6 +14,7 @@ MAINTAINER = Thomas Frohwein <thfr@openb # Apache 2.0 PERMIT_PACKAGE = Yes +# vulkan is dynamically opened via statically linked volk/dlopen WANTLIB += ${COMPILER_LIBCXX} X11 c m vulkan xcb # C++11 @@ -25,6 +26,7 @@ MODULES = devel/cmake \ MODPY_RUNDEP = No BUILD_DEPENDS = graphics/glslang \ + graphics/volk \ graphics/vulkan-headers LIB_DEPENDS = graphics/vulkan-loader @@ -34,9 +36,5 @@ CONFIGURE_ARGS += -DGLSLANG_INSTALL_DIR= NO_TEST = Yes CXXFLAGS += -I${X11BASE}/include - -# glslangValidator -> glslang until this port can cope with glslang-12.3.1+ -pre-configure: - find ${WRKSRC} -type f -exec sed -i 's,glslangValidator,glslang,g' {} \; .include <bsd.port.mk> Index: vulkan-tools/distinfo =================================================================== RCS file: /cvs/ports/graphics/vulkan-tools/distinfo,v retrieving revision 1.12 diff -u -p -r1.12 distinfo --- vulkan-tools/distinfo 5 Sep 2023 19:07:50 -0000 1.12 +++ vulkan-tools/distinfo 24 Feb 2024 19:58:33 -0000 @@ -1,2 +1,2 @@ -SHA256 (Vulkan-Tools-sdk-1.3.261.1.tar.gz) = B1Q9dhta5T44D996P0K9cG8s8a0EoxA4H884b++4FMY= -SIZE (Vulkan-Tools-sdk-1.3.261.1.tar.gz) = 801322 +SHA256 (Vulkan-Tools-vulkan-sdk-1.3.275.0.tar.gz) = och2psKILjZRQZQmQaOOCnv6ZoSn3O27AGaiDAZiW9A= +SIZE (Vulkan-Tools-vulkan-sdk-1.3.275.0.tar.gz) = 755289 Index: vulkan-validation-layers/Makefile =================================================================== RCS file: /cvs/ports/graphics/vulkan-validation-layers/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- vulkan-validation-layers/Makefile 5 Sep 2023 19:07:50 -0000 1.20 +++ vulkan-validation-layers/Makefile 24 Feb 2024 19:58:33 -0000 @@ -1,8 +1,8 @@ COMMENT = Vulkan Validation Layers -V = 1.3.261.1 +V = 1.3.275.0 PKGNAME = vulkan-validation-layers-${V} -GH_TAGNAME = sdk-${V} +GH_TAGNAME = vulkan-sdk-${V} GH_ACCOUNT = KhronosGroup GH_PROJECT = Vulkan-ValidationLayers @@ -23,14 +23,16 @@ MODULES = devel/cmake \ lang/python MODPY_RUNDEP = No -BUILD_DEPENDS = devel/robin-hood-hashing \ +BUILD_DEPENDS = graphics/spirv-headers \ + graphics/spirv-tools \ graphics/vulkan-headers \ - graphics/spirv-headers \ - graphics/spirv-tools + graphics/vulkan-utility-libraries -CONFIGURE_ARGS += -DBUILD_WSI_WAYLAND_SUPPORT=False \ +# needs robin_hood cmake package to build with robing hood hashing +CONFIGURE_ARGS += -DBUILD_WERROR=False \ + -DBUILD_WSI_WAYLAND_SUPPORT=False \ -DSPIRV_HEADERS_INSTALL_DIR=${LOCALBASE}/include/spirv \ - -DBUILD_WERROR=False + -DUSE_ROBIN_HOOD_HASHING=False # Tests only build if Google Test framework is in directory external/ NO_TEST = Yes Index: vulkan-validation-layers/distinfo =================================================================== RCS file: /cvs/ports/graphics/vulkan-validation-layers/distinfo,v retrieving revision 1.12 diff -u -p -r1.12 distinfo --- vulkan-validation-layers/distinfo 5 Sep 2023 19:07:50 -0000 1.12 +++ vulkan-validation-layers/distinfo 24 Feb 2024 19:58:33 -0000 @@ -1,2 +1,2 @@ -SHA256 (Vulkan-ValidationLayers-sdk-1.3.261.1.tar.gz) = E3LVIvKXuz+zhoArGqS3+IWp4elppqPG6bKdOBNX8h0= -SIZE (Vulkan-ValidationLayers-sdk-1.3.261.1.tar.gz) = 5005018 +SHA256 (Vulkan-ValidationLayers-vulkan-sdk-1.3.275.0.tar.gz) = rP2EA5EJIgEpYksOy2mYC7w6hYl4xitVbb4W79DyZ1U= +SIZE (Vulkan-ValidationLayers-vulkan-sdk-1.3.275.0.tar.gz) = 5280585 Index: vulkan-validation-layers/patches/patch-layers_vulkan_generated_vk_extension_helper_h =================================================================== RCS file: vulkan-validation-layers/patches/patch-layers_vulkan_generated_vk_extension_helper_h diff -N vulkan-validation-layers/patches/patch-layers_vulkan_generated_vk_extension_helper_h --- vulkan-validation-layers/patches/patch-layers_vulkan_generated_vk_extension_helper_h 5 Sep 2023 19:07:50 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -avoid collision with major/minor in types.h - -Index: layers/vulkan/generated/vk_extension_helper.h ---- layers/vulkan/generated/vk_extension_helper.h.orig -+++ layers/vulkan/generated/vk_extension_helper.h -@@ -74,6 +74,12 @@ Times to NOT use it - - #define VVL_UNRECOGNIZED_API_VERSION 0xFFFFFFFF - -+#ifdef __OpenBSD__ -+// collision with types.h -+#undef major -+#undef minor -+#endif -+ - class APIVersion { - public: - APIVersion() : api_version_(VVL_UNRECOGNIZED_API_VERSION) {}
