Index: head/devel/spirv-tools/Makefile =================================================================== --- head/devel/spirv-tools/Makefile (revision 556310) +++ head/devel/spirv-tools/Makefile (revision 556311) @@ -1,25 +1,25 @@ # $FreeBSD$ PORTNAME= spirv-tools DISTVERSIONPREFIX= v -DISTVERSION= 2020.2 +DISTVERSION= 2020.4 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology COMMENT= Tools for processing SPIR-V intermediate shader language modules LICENSE= APACHE20 USES= cmake compiler:c++11-lib python:3.4+,build shebangfix USE_LDCONFIG= yes SHEBANG_FILES= tools/lesspipe/spirv-lesspipe.sh USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= SPIRV-Tools -GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.3:headers/external/spirv-headers +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.3.reservations1:headers/external/spirv-headers CMAKE_ON= SPIRV_SKIP_TESTS CMAKE_OFF= SPIRV_WERROR .include Index: head/devel/spirv-tools/distinfo =================================================================== --- head/devel/spirv-tools/distinfo (revision 556310) +++ head/devel/spirv-tools/distinfo (revision 556311) @@ -1,5 +1,5 @@ -TIMESTAMP = 1589409763 -SHA256 (KhronosGroup-SPIRV-Tools-v2020.2_GH0.tar.gz) = 29f376f6ebc24d3ce39c1aa47101c4b5d256c8247e41068b541dd43bb88d4174 -SIZE (KhronosGroup-SPIRV-Tools-v2020.2_GH0.tar.gz) = 2126892 -SHA256 (KhronosGroup-SPIRV-Headers-1.5.3_GH0.tar.gz) = eece8a9e147d37997d425d5d2eeb2e757ad25adc30d6651467094f3b18609b5a -SIZE (KhronosGroup-SPIRV-Headers-1.5.3_GH0.tar.gz) = 386853 +TIMESTAMP = 1606327101 +SHA256 (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = d6377d2febe831eb78e84593a10d242a4fd52cb12174133151cb48801abdc6d2 +SIZE (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = 2282982 +SHA256 (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = aa3c579cd250b23aae735c7c55c3514df4ffc5f98963d95a952bcc89336768bd +SIZE (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = 393836 Index: head/devel/vulkan-headers/Makefile =================================================================== --- head/devel/vulkan-headers/Makefile (revision 556310) +++ head/devel/vulkan-headers/Makefile (revision 556311) @@ -1,20 +1,20 @@ # $FreeBSD$ PORTNAME= vulkan-headers DISTVERSIONPREFIX=sdk- -DISTVERSION= 1.2.135.0 +DISTVERSION= 1.2.154.0 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology COMMENT= Headers for the Vulkan graphics API LICENSE= APACHE20 USES= cmake STRIP= # nothing to strip USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Headers .include Index: head/devel/vulkan-headers/distinfo =================================================================== --- head/devel/vulkan-headers/distinfo (revision 556310) +++ head/devel/vulkan-headers/distinfo (revision 556311) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589407360 -SHA256 (KhronosGroup-Vulkan-Headers-sdk-1.2.135.0_GH0.tar.gz) = befc69991e1e268db75921c577be32a3f315d01d78b39b74ef87ba6908787b63 -SIZE (KhronosGroup-Vulkan-Headers-sdk-1.2.135.0_GH0.tar.gz) = 757133 +TIMESTAMP = 1600680367 +SHA256 (KhronosGroup-Vulkan-Headers-sdk-1.2.154.0_GH0.tar.gz) = a0528ade4dd3bd826b960ba4ccabc62e92ecedc3c70331b291e0a7671b3520f9 +SIZE (KhronosGroup-Vulkan-Headers-sdk-1.2.154.0_GH0.tar.gz) = 817107 Index: head/devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp =================================================================== --- head/devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp (revision 556310) +++ head/devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp (revision 556311) @@ -1,47 +1,56 @@ ---- include/vulkan/vulkan.hpp.orig 2020-05-14 18:48:51 UTC +--- include/vulkan/vulkan.hpp.orig 2020-09-21 09:26:07 UTC +++ include/vulkan/vulkan.hpp -@@ -65,7 +65,7 @@ +@@ -66,7 +66,7 @@ #endif #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1 --# if defined(__linux__) || defined(__APPLE__) -+# if defined(__unix__) - # include - # endif - -@@ -81153,7 +81153,7 @@ namespace VULKAN_HPP_NAMESPACE - DynamicLoader() : m_success( false ) - #endif +-# if defined( __linux__ ) || defined( __APPLE__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) + # include + # elif defined( _WIN32 ) + typedef struct HINSTANCE__ * HINSTANCE; +@@ -90062,7 +90062,7 @@ namespace VULKAN_HPP_NAMESPACE { --#if defined(__linux__) -+#if defined(__unix__) - m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL ); - #elif defined(__APPLE__) - m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL ); -@@ -81195,7 +81195,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 = ::LoadLibraryA( vulkanLibraryName.c_str() ); +@@ -90072,7 +90072,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 ) + { +@@ -90119,7 +90119,7 @@ namespace VULKAN_HPP_NAMESPACE { if ( m_library ) { --#if defined(__linux__) || defined(__APPLE__) -+#if defined(__unix__) +-# if defined( __linux__ ) || defined( __APPLE__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) dlclose( m_library ); - #elif defined(_WIN32) - FreeLibrary( m_library ); -@@ -81206,7 +81206,7 @@ namespace VULKAN_HPP_NAMESPACE + # elif defined( _WIN32 ) + ::FreeLibrary( m_library ); +@@ -90132,7 +90132,7 @@ namespace VULKAN_HPP_NAMESPACE template T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT { --#if defined(__linux__) || defined(__APPLE__) -+#if defined(__unix__) +-# if defined( __linux__ ) || defined( __APPLE__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) return (T)dlsym( m_library, function ); - #elif defined(_WIN32) - return (T)GetProcAddress( m_library, function ); -@@ -81217,7 +81217,7 @@ namespace VULKAN_HPP_NAMESPACE + # elif defined( _WIN32 ) + return (T)::GetProcAddress( m_library, function ); +@@ -90145,7 +90145,7 @@ namespace VULKAN_HPP_NAMESPACE private: bool m_success; --#if defined(__linux__) || defined(__APPLE__) -+#if defined(__unix__) - void *m_library; - #elif defined(_WIN32) - HMODULE m_library; +-# if defined( __linux__ ) || defined( __APPLE__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) + void * m_library; + # elif defined( _WIN32 ) + ::HINSTANCE m_library; Index: head/devel/vulkan-headers/pkg-plist =================================================================== --- head/devel/vulkan-headers/pkg-plist (revision 556310) +++ head/devel/vulkan-headers/pkg-plist (revision 556311) @@ -1,29 +1,30 @@ 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 include/vulkan/vulkan_android.h include/vulkan/vulkan_beta.h include/vulkan/vulkan_core.h +include/vulkan/vulkan_directfb.h include/vulkan/vulkan_fuchsia.h include/vulkan/vulkan_ggp.h include/vulkan/vulkan_ios.h include/vulkan/vulkan_macos.h include/vulkan/vulkan_metal.h include/vulkan/vulkan_vi.h include/vulkan/vulkan_wayland.h include/vulkan/vulkan_win32.h include/vulkan/vulkan_xcb.h include/vulkan/vulkan_xlib.h include/vulkan/vulkan_xlib_xrandr.h share/vulkan/registry/cgenerator.py 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/util.py share/vulkan/registry/validusage.json share/vulkan/registry/vk.xml share/vulkan/registry/vkconventions.py Index: head/devel/vulkan-tools/Makefile =================================================================== --- head/devel/vulkan-tools/Makefile (revision 556310) +++ head/devel/vulkan-tools/Makefile (revision 556311) @@ -1,75 +1,74 @@ # $FreeBSD$ PORTNAME= vulkan-tools DISTVERSIONPREFIX= sdk- -DISTVERSION= 1.2.135.0 -PORTREVISION= 3 +DISTVERSION= 1.2.154.0 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology COMMENT= Tools and demos for the Vulkan graphics API LICENSE= APACHE20 BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \ glslangValidator:devel/glslang LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader USES= cmake compiler:c++11-lib pkgconfig python:3.4+,build USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Tools CMAKE_OFF= BUILD_CUBE BUILD_ICD CMAKE_ARGS= -DGLSLANG_INSTALL_DIR=${LOCALBASE} OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT= WAYLAND XCB XLIB OPTIONS_SLAVE= DISPLAY OPTIONS_SUB= yes WAYLAND_DESC= Build Wayland WSI (Window System Integration) support XCB_DESC= Build XCB WSI (Window System Integration) support XLIB_DESC= Build Xlib WSI (Window System Integration) support WAYLAND_PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -WAYLAND_PATCHFILES= 6f6e3371c92a.patch:-p1 +WAYLAND_PATCHFILES= ea2e75bea224.patch:-p1 WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ wayland-protocols>0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT XCB_CMAKE_BOOL= BUILD_WSI_XCB_SUPPORT XCB_LIB_DEPENDS= libxcb.so:x11/libxcb XLIB_CMAKE_BOOL= BUILD_WSI_XLIB_SUPPORT XLIB_LIB_DEPENDS= libX11.so:x11/libX11 \ libXext.so:x11/libXext \ libICE.so:x11/libICE \ libSM.so:x11/libSM # https://github.com/KhronosGroup/Vulkan-Headers/issues/122 display-build: .IGNORE display-install: .IGNORE # https://github.com/KhronosGroup/Vulkan-Tools/issues/307 .for _wsi in display wayland xcb xlib do-configure-${_wsi:tu}-on: ${_wsi}-configure ${_wsi}-configure: @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} \ -DBUILD_CUBE:BOOL=ON -DBUILD_VULKANINFO:BOOL=OFF \ -DCUBE_WSI_SELECTION:STRING=${_wsi:tu} \ -B${CONFIGURE_WRKSRC}-${_wsi} do-build-${_wsi:tu}-on: ${_wsi}-build ${_wsi}-build: @${SETENV} ${MAKE_ENV} ${CMAKE_BIN} --build ${BUILD_WRKSRC}-${_wsi} do-install-${_wsi:tu}-on: ${_wsi}-install ${_wsi}-install: . for _file in vkcube vkcubepp ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}-${_wsi}/cube/${_file} \ ${STAGEDIR}${PREFIX}/bin/${_file}-${_wsi} . endfor .endfor .include Index: head/devel/vulkan-tools/distinfo =================================================================== --- head/devel/vulkan-tools/distinfo (revision 556310) +++ head/devel/vulkan-tools/distinfo (revision 556311) @@ -1,5 +1,5 @@ -TIMESTAMP = 1589481709 -SHA256 (KhronosGroup-Vulkan-Tools-sdk-1.2.135.0_GH0.tar.gz) = 83add7b6390ab1eb9b71106b50d7f5ae6afb74374762f0028afc9fdef5380c83 -SIZE (KhronosGroup-Vulkan-Tools-sdk-1.2.135.0_GH0.tar.gz) = 710085 -SHA256 (6f6e3371c92a.patch) = 98ee52a6378ece93e0f2ae738677c25e2874b3615a9a1e194814ba8321dd37fb -SIZE (6f6e3371c92a.patch) = 22365 +TIMESTAMP = 1601595292 +SHA256 (KhronosGroup-Vulkan-Tools-sdk-1.2.154.0_GH0.tar.gz) = c7d66ec1f5fe5c0a13e487fe5c6eefd3a954522c0b05f06bd2ae41792aeea272 +SIZE (KhronosGroup-Vulkan-Tools-sdk-1.2.154.0_GH0.tar.gz) = 720085 +SHA256 (ea2e75bea224.patch) = 1a2550804a1bd7e66f5d19043dc540ffadc55a1bfe6b8734c353c0bd3a1090d1 +SIZE (ea2e75bea224.patch) = 22460 Index: head/devel/vulkan-tools/pkg-plist =================================================================== --- head/devel/vulkan-tools/pkg-plist (revision 556310) +++ head/devel/vulkan-tools/pkg-plist (revision 556311) @@ -1,8 +1,9 @@ %%DISPLAY%%bin/vkcube-display %%WAYLAND%%bin/vkcube-wayland %%XCB%%bin/vkcube-xcb %%XLIB%%bin/vkcube-xlib +%%DISPLAY%%bin/vkcubepp-display %%WAYLAND%%bin/vkcubepp-wayland %%XCB%%bin/vkcubepp-xcb %%XLIB%%bin/vkcubepp-xlib bin/vulkaninfo Index: head/devel/vulkan-validation-layers/Makefile =================================================================== --- head/devel/vulkan-validation-layers/Makefile (revision 556310) +++ head/devel/vulkan-validation-layers/Makefile (revision 556311) @@ -1,37 +1,40 @@ # $FreeBSD$ PORTNAME= vulkan-validation-layers DISTVERSIONPREFIX= sdk- -DISTVERSION= 1.2.135.0 +DISTVERSION= 1.2.154.0 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology COMMENT= Validation layers for the Vulkan graphics API LICENSE= APACHE20 # NOTE: keep spirv-tools and glslang up to date when updating Vulkan BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \ ${LOCALBASE}/include/spirv-tools/libspirv.h:devel/spirv-tools \ ${LOCALBASE}/include/SPIRV/spirv.hpp:devel/glslang USES= cmake compiler:c++11-lib pkgconfig python:3.4+,build USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-ValidationLayers +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.3.reservations1:headers/external/spirv-headers # WSI_* in here are leftover from when all of Vulkan SDK was in one repo CMAKE_OFF= BUILD_TESTS BUILD_WSI_XCB_SUPPORT BUILD_WSI_XLIB_SUPPORT \ BUILD_WSI_WAYLAND_SUPPORT CMAKE_ON= BUILD_LAYER_SUPPORT_FILES CMAKE_ARGS= -DGLSLANG_INSTALL_DIR=${LOCALBASE} \ -DCMAKE_INSTALL_INCLUDEDIR=${LOCALBASE}/include \ + -DSPIRV_HEADERS_INSTALL_DIR=${WRKSRC_headers} \ + -DSPIRV_TOOLS_INSTALL_DIR=${LOCALBASE} \ -DCMAKE_BUILD_TYPE=Release post-install: # Avoid conflict with devel/xxhash @${RM} ${STAGEDIR}${PREFIX}/include/xxhash.* .include Index: head/devel/vulkan-validation-layers/distinfo =================================================================== --- head/devel/vulkan-validation-layers/distinfo (revision 556310) +++ head/devel/vulkan-validation-layers/distinfo (revision 556311) @@ -1,3 +1,5 @@ -TIMESTAMP = 1589407394 -SHA256 (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.135.0_GH0.tar.gz) = 7a33aa13d9526da4deb945b3ccf5be9cf3c99fb4dfce2caf57640746c1c648d3 -SIZE (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.135.0_GH0.tar.gz) = 1980283 +TIMESTAMP = 1606326879 +SHA256 (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.154.0_GH0.tar.gz) = 8898ab05d0d8dec04fbba03d0ed2e79a1eb5c0382e5c89d4c737b45a6648f7f9 +SIZE (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.154.0_GH0.tar.gz) = 2316466 +SHA256 (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = aa3c579cd250b23aae735c7c55c3514df4ffc5f98963d95a952bcc89336768bd +SIZE (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = 393836 Index: head/games/vkquake/Makefile =================================================================== --- head/games/vkquake/Makefile (revision 556310) +++ head/games/vkquake/Makefile (revision 556311) @@ -1,98 +1,101 @@ # $FreeBSD$ PORTNAME= vkquake DISTVERSION= 1.03.0 PORTREVISION= 1 CATEGORIES= games +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= a869a22d9b51.patch:-p2 # vulkan-headers >= 140 + MAINTAINER= greg@unrelenting.technology COMMENT= Quake 1 port using Vulkan instead of OpenGL, based on QuakeSpasm LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/../LICENSE.txt BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers LIB_DEPENDS= libX11-xcb.so:x11/libX11 \ libvulkan.so:graphics/vulkan-loader WRKSRC_SUBDIR= Quake USES= desktop-file-utils gmake gnome pkgconfig sdl USE_SDL= sdl2 USE_GITHUB= yes GH_ACCOUNT= Novum GH_PROJECT= vkQuake INSTALLS_ICONS= yes MAKE_ENV= prefix=${PREFIX} bindir=${PREFIX}/bin VULKAN_SDK=${LOCALBASE} ALL_TARGET= # empty .include "${.CURDIR}/../quake-data/Makefile.include" CFLAGS+= -DDATADIR='\"${Q1DIR}\"' OPTIONS_DEFINE= USERDIRS WAVE FLAC MP3 VORBIS # OPUS OPTIONS_RADIO= MODPLAYER OPTIONS_RADIO_MODPLAYER= MIKMOD XMP MODPLUG OPTIONS_DEFAULT= USERDIRS WAVE FLAC VORBIS MODPLUG # OPUS MODPLUG USERDIRS_DESC= Enable support for loading game files from user directories (~/.vkquake) WAVE_DESC= Enable support for Wave music FLAC_DESC= Enable support for FLAC music MP3_DESC= Enable support for MP3 music VORBIS_DESC= Enable support for Ogg Vorbis music # OPUS_DESC= Enable support for Opus music MIKMOD_DESC= Enable support for tracker module music using MikMod XMP_DESC= Enable support for tracker module music using XMP MODPLUG_DESC= Enable support for tracker module music using ModPlug USERDIRS_MAKE_ARGS= DO_USERDIRS=1 USERDIRS_MAKE_ARGS_OFF= DO_USERDIRS=0 WAVE_MAKE_ARGS= USE_CODEC_WAVE=1 WAVE_MAKE_ARGS_OFF= USE_CODEC_WAVE=0 FLAC_MAKE_ARGS= USE_CODEC_FLAC=1 FLAC_MAKE_ARGS_OFF= USE_CODEC_FLAC=0 FLAC_LIB_DEPENDS= libFLAC.so:audio/flac MP3_MAKE_ARGS= USE_CODEC_MP3=1 MP3LIB=mpg123 MP3_MAKE_ARGS_OFF= USE_CODEC_MP3=0 MP3_LIB_DEPENDS= libmpg123.so:audio/mpg123 VORBIS_MAKE_ARGS= USE_CODEC_VORBIS=1 VORBISLIB=vorbis VORBIS_MAKE_ARGS_OFF= USE_CODEC_VORBIS=0 VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libvorbisfile.so:audio/libvorbis \ libogg.so:audio/libogg # XXX: crashes on start # OPUS_MAKE_ARGS= USE_CODEC_OPUS=1 # OPUS_MAKE_ARGS_OFF= USE_CODEC_OPUS=0 # OPUS_LIB_DEPENDS= libopus.so:audio/opus \ # libopusfile.so:audio/opusfile MIKMOD_MAKE_ARGS= USE_CODEC_MIKMOD=1 MIKMOD_MAKE_ARGS_OFF= USE_CODEC_MIKMOD=0 MIKMOD_LIB_DEPENDS= libmikmod.so:audio/libmikmod XMP_MAKE_ARGS= USE_CODEC_XMP=1 XMP_MAKE_ARGS_OFF= USE_CODEC_XMP=0 XMP_LIB_DEPENDS= libxmp.so:audio/xmp MODPLUG_MAKE_ARGS= USE_CODEC_MODPLUG=1 MODPLUG_MAKE_ARGS_OFF= USE_CODEC_MODPLUG=0 MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug post-install: ${MKDIR} ${STAGEDIR}${Q1DIR} ${INSTALL_DATA} ${WRKSRC}/vkquake.pak ${STAGEDIR}${Q1DIR} ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps ${INSTALL_DATA} ${FILESDIR}/vkquake.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/vkquake.png ${INSTALL_DATA} ${FILESDIR}/vkquake.desktop \ ${STAGEDIR}${PREFIX}/share/applications .include Index: head/games/vkquake/distinfo =================================================================== --- head/games/vkquake/distinfo (revision 556310) +++ head/games/vkquake/distinfo (revision 556311) @@ -1,3 +1,5 @@ TIMESTAMP = 1573391422 SHA256 (Novum-vkQuake-1.03.0_GH0.tar.gz) = 5cb745c4ee139aa6e9aaac580db08d4ae98ee4fac8eb3c08a05256af81d5a150 SIZE (Novum-vkQuake-1.03.0_GH0.tar.gz) = 3869031 +SHA256 (a869a22d9b51.patch) = cfbaf8836da0bbcb7f77afeec435510d63ed9b20ae9627a389d23976655f1069 +SIZE (a869a22d9b51.patch) = 906 Index: head/graphics/vulkan-loader/Makefile =================================================================== --- head/graphics/vulkan-loader/Makefile (revision 556310) +++ head/graphics/vulkan-loader/Makefile (revision 556311) @@ -1,44 +1,45 @@ # $FreeBSD$ PORTNAME= vulkan-loader DISTVERSIONPREFIX=sdk- -DISTVERSION= 1.2.135.0 +DISTVERSION= 1.2.154.1 CATEGORIES= graphics devel -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 8d2d49a9c89d.patch:-p1 # https://github.com/KhronosGroup/Vulkan-Loader/pull/419 - MAINTAINER= greg@unrelenting.technology COMMENT= Driver loader for the Vulkan graphics API LICENSE= APACHE20 BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers USES= cmake compiler:${ARCH:Mi386:C/.+/gcc-/}c++11-lib pkgconfig python:3.4+,build USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Loader CMAKE_ON= CMAKE_SKIP_RPATH CMAKE_OFF= BUILD_TESTS OPTIONS_DEFINE= XLIB XCB WAYLAND OPTIONS_DEFAULT=XLIB XCB WAYLAND 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 XLIB_CMAKE_BOOL= BUILD_WSI_XLIB_SUPPORT XLIB_LIB_DEPENDS= libX11.so:x11/libX11 \ libXrandr.so:x11/libXrandr XCB_CMAKE_BOOL= BUILD_WSI_XCB_SUPPORT XCB_LIB_DEPENDS= libX11-xcb.so:x11/libX11 \ libxcb.so:x11/libxcb WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland + +post-patch: +# _XOPEN_SOURCE enforces X/Open-compliance but alloca isn't there + @${REINPLACE_CMD} '/_XOPEN_SOURCE/d' ${WRKSRC}/loader/CMakeLists.txt .include Index: head/graphics/vulkan-loader/distinfo =================================================================== --- head/graphics/vulkan-loader/distinfo (revision 556310) +++ head/graphics/vulkan-loader/distinfo (revision 556311) @@ -1,5 +1,3 @@ -TIMESTAMP = 1589407291 -SHA256 (KhronosGroup-Vulkan-Loader-sdk-1.2.135.0_GH0.tar.gz) = 98cd19e4603ca6acc5427686516d0abbf5026acf519d9e40f8136acf809cd117 -SIZE (KhronosGroup-Vulkan-Loader-sdk-1.2.135.0_GH0.tar.gz) = 1406699 -SHA256 (8d2d49a9c89d.patch) = 8c5a755821d340303155cae985e1a9cea4cb6f4e9aab10de9e7297e505d4d6d3 -SIZE (8d2d49a9c89d.patch) = 1064 +TIMESTAMP = 1602103147 +SHA256 (KhronosGroup-Vulkan-Loader-sdk-1.2.154.1_GH0.tar.gz) = 889e45f7175d915dd0d702013b8021192e181d20f2ad4021c94006088f1edfe5 +SIZE (KhronosGroup-Vulkan-Loader-sdk-1.2.154.1_GH0.tar.gz) = 1417527 Index: head/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h =================================================================== --- head/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h (revision 556310) +++ head/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h (revision 556311) @@ -1,11 +1,38 @@ ---- loader/vk_loader_platform.h.orig 2020-04-02 16:20:56 UTC +--- loader/vk_loader_platform.h.orig 2020-10-07 20:39:07 UTC +++ loader/vk_loader_platform.h @@ -31,7 +31,7 @@ #include "vulkan/vk_platform.h" #include "vulkan/vk_sdk_platform.h" -#if defined(__linux__) || defined(__APPLE__) +#if defined(__unix__) /* Linux-specific common code: */ // Headers: +@@ -116,6 +116,26 @@ static inline char *loader_platform_executable_path(ch + int ret = proc_pidpath(pid, buffer, size); + if (ret <= 0) return NULL; + buffer[ret] = '\0'; ++ return buffer; ++} ++#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) ++#include ++static inline char *loader_platform_executable_path(char *buffer, size_t size) { ++ int mib[] = { ++ CTL_KERN, ++#if defined(__NetBSD__) ++ KERN_PROC_ARGS, ++ -1, ++ KERN_PROC_PATHNAME, ++#else ++ KERN_PROC, ++ KERN_PROC_PATHNAME, ++ -1, ++#endif ++ }; ++ if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buffer, &size, NULL, 0) < 0) ++ return NULL; ++ + return buffer; + } + #endif // defined (__APPLE__) Index: head/graphics/vulkan-loader/pkg-plist =================================================================== --- head/graphics/vulkan-loader/pkg-plist (revision 556310) +++ head/graphics/vulkan-loader/pkg-plist (revision 556311) @@ -1,4 +1,4 @@ lib/libvulkan.so lib/libvulkan.so.1 -lib/libvulkan.so.1.2.135 +lib/libvulkan.so.1.2.154 libdata/pkgconfig/vulkan.pc Index: head/multimedia/gstreamer1-plugins-bad/files/patch-git_dc57fb70 =================================================================== --- head/multimedia/gstreamer1-plugins-bad/files/patch-git_dc57fb70 (nonexistent) +++ head/multimedia/gstreamer1-plugins-bad/files/patch-git_dc57fb70 (revision 556311) @@ -0,0 +1,26 @@ +https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1255 + +vkerror.c:66:16: error: use of undeclared identifier 'VK_RESULT_BEGIN_RANGE' + if (result < VK_RESULT_BEGIN_RANGE) + ^ + +--- ext/vulkan/vkerror.c.orig 2019-04-19 09:16:36 UTC ++++ ext/vulkan/vkerror.c +@@ -27,7 +27,7 @@ + #include "vkerror.h" + + /* *INDENT-OFF* */ +-static const struct ++static const struct + { + VkResult result; + const char *str; +@@ -63,8 +63,6 @@ _vk_result_to_string (VkResult result) + + if (result >= 0) + return NULL; +- if (result < VK_RESULT_BEGIN_RANGE) +- return "Unknown Error"; + + for (i = 0; i < G_N_ELEMENTS (vk_result_string_map); i++) { + if (result == vk_result_string_map[i].result) Property changes on: head/multimedia/gstreamer1-plugins-bad/files/patch-git_dc57fb70 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property