Index: head/devel/glslang/Makefile =================================================================== --- head/devel/glslang/Makefile (revision 505866) +++ head/devel/glslang/Makefile (revision 505867) @@ -1,22 +1,22 @@ # $FreeBSD$ PORTNAME= glslang -DISTVERSION= 7.10.2984 +DISTVERSION= 7.11.3214 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology COMMENT= OpenGL and OpenGL ES shader front end and validator LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKDIR}/LICENSE USES= cmake compiler:c++11-lib USE_GITHUB= yes GH_ACCOUNT= KhronosGroup post-extract: ${SED} '/^$$/,$$d' ${WRKSRC}/${PORTNAME}/Include/Types.h \ >${WRKDIR}/LICENSE .include Index: head/devel/glslang/distinfo =================================================================== --- head/devel/glslang/distinfo (revision 505866) +++ head/devel/glslang/distinfo (revision 505867) @@ -1,3 +1,3 @@ -TIMESTAMP = 1546371497 -SHA256 (KhronosGroup-glslang-7.10.2984_GH0.tar.gz) = d0afe88034577ecf06a825db1a5e8222d949a38d3b19c5ce002b90b66c403f67 -SIZE (KhronosGroup-glslang-7.10.2984_GH0.tar.gz) = 2439082 +TIMESTAMP = 1562246947 +SHA256 (KhronosGroup-glslang-7.11.3214_GH0.tar.gz) = b30b4668734328d256e30c94037e60d3775b1055743c04d8fd709f2960f302a9 +SIZE (KhronosGroup-glslang-7.11.3214_GH0.tar.gz) = 2841979 Index: head/devel/spirv-tools/Makefile =================================================================== --- head/devel/spirv-tools/Makefile (revision 505866) +++ head/devel/spirv-tools/Makefile (revision 505867) @@ -1,25 +1,25 @@ # $FreeBSD$ PORTNAME= spirv-tools DISTVERSIONPREFIX= v -DISTVERSION= 2018.6 +DISTVERSION= 2019.3 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:build shebangfix +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:4618b86e9e4b0:headers/external/spirv-headers +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.4.1: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 505866) +++ head/devel/spirv-tools/distinfo (revision 505867) @@ -1,5 +1,5 @@ -TIMESTAMP = 1546371368 -SHA256 (KhronosGroup-SPIRV-Tools-v2018.6_GH0.tar.gz) = e7fccd5e1e134a4ce09a25475ca52c5a8a57085b07e0bbaa39aff20d36911d66 -SIZE (KhronosGroup-SPIRV-Tools-v2018.6_GH0.tar.gz) = 1385520 -SHA256 (KhronosGroup-SPIRV-Headers-4618b86e9e4b0_GH0.tar.gz) = c8b276d27380bcb0ab019688c7b061af89c402176429639f9b88743366f2f1ba -SIZE (KhronosGroup-SPIRV-Headers-4618b86e9e4b0_GH0.tar.gz) = 322977 +TIMESTAMP = 1562246419 +SHA256 (KhronosGroup-SPIRV-Tools-v2019.3_GH0.tar.gz) = 57c59584d83294ac914c1b21530f9441c29d30979a54e5f0a97b10715dc42c64 +SIZE (KhronosGroup-SPIRV-Tools-v2019.3_GH0.tar.gz) = 1612835 +SHA256 (KhronosGroup-SPIRV-Headers-1.4.1_GH0.tar.gz) = a244f0629f75eb450e090cd773d30e22367cb231e964c7492588eb9000201fd1 +SIZE (KhronosGroup-SPIRV-Headers-1.4.1_GH0.tar.gz) = 359347 Index: head/devel/spirv-tools/pkg-plist =================================================================== --- head/devel/spirv-tools/pkg-plist (revision 505866) +++ head/devel/spirv-tools/pkg-plist (revision 505867) @@ -1,18 +1,21 @@ bin/spirv-as bin/spirv-cfg bin/spirv-dis bin/spirv-lesspipe.sh bin/spirv-link bin/spirv-opt +bin/spirv-reduce bin/spirv-stats bin/spirv-val +include/spirv-tools/instrument.hpp 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 libdata/pkgconfig/SPIRV-Tools-shared.pc libdata/pkgconfig/SPIRV-Tools.pc Index: head/devel/vulkan-headers/Makefile =================================================================== --- head/devel/vulkan-headers/Makefile (revision 505866) +++ head/devel/vulkan-headers/Makefile (revision 505867) @@ -1,20 +1,20 @@ # $FreeBSD$ PORTNAME= vulkan-headers DISTVERSIONPREFIX=sdk- -DISTVERSION= 1.1.82.0 +DISTVERSION= 1.1.108.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 505866) +++ head/devel/vulkan-headers/distinfo (revision 505867) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533661644 -SHA256 (KhronosGroup-Vulkan-Headers-sdk-1.1.82.0_GH0.tar.gz) = df73da07d547cfbe88a797802401ea8225e4844e13d4fde52a7cb6e00e5179e5 -SIZE (KhronosGroup-Vulkan-Headers-sdk-1.1.82.0_GH0.tar.gz) = 472646 +TIMESTAMP = 1562245991 +SHA256 (KhronosGroup-Vulkan-Headers-sdk-1.1.108.0_GH0.tar.gz) = 944e88911e47e5d34bc4360e3e5833a0d550e3e7483dfa27a5f4d38525a1b943 +SIZE (KhronosGroup-Vulkan-Headers-sdk-1.1.108.0_GH0.tar.gz) = 580538 Index: head/devel/vulkan-headers/pkg-plist =================================================================== --- head/devel/vulkan-headers/pkg-plist (revision 505866) +++ head/devel/vulkan-headers/pkg-plist (revision 505867) @@ -1,23 +1,27 @@ 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_core.h +include/vulkan/vulkan_fuchsia.h +include/vulkan/vulkan_ggp.h include/vulkan/vulkan_ios.h include/vulkan/vulkan_macos.h -include/vulkan/vulkan_mir.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/validusage.json share/vulkan/registry/vk.xml +share/vulkan/registry/vkconventions.py Index: head/devel/vulkan-tools/Makefile =================================================================== --- head/devel/vulkan-tools/Makefile (revision 505866) +++ head/devel/vulkan-tools/Makefile (revision 505867) @@ -1,31 +1,28 @@ # $FreeBSD$ PORTNAME= vulkan-tools DISTVERSIONPREFIX= sdk- -DISTVERSION= 1.1.82.0 -PORTREVISION= 2 +DISTVERSION= 1.1.108.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 \ - libX11-xcb.so:x11/libX11 \ - libXrandr.so:x11/libXrandr \ - libxcb.so:x11/libxcb +LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader USES= cmake compiler:c++11-lib pkgconfig python:3.4+,build +USE_XORG= x11 xcb xrandr sm ice xext USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Tools CMAKE_OFF= BUILD_TESTS BUILD_ICD \ - BUILD_WSI_WAYLAND_SUPPORT BUILD_WSI_MIR_SUPPORT + BUILD_WSI_WAYLAND_SUPPORT CMAKE_ARGS= -DGLSLANG_INSTALL_DIR=${LOCALBASE} .include Index: head/devel/vulkan-tools/distinfo =================================================================== --- head/devel/vulkan-tools/distinfo (revision 505866) +++ head/devel/vulkan-tools/distinfo (revision 505867) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533667375 -SHA256 (KhronosGroup-Vulkan-Tools-sdk-1.1.82.0_GH0.tar.gz) = 22e5e5dfd47535e1664458ee59706abcaace96575d1a3d7fa9ae779a9e83b89c -SIZE (KhronosGroup-Vulkan-Tools-sdk-1.1.82.0_GH0.tar.gz) = 342057 +TIMESTAMP = 1562259460 +SHA256 (KhronosGroup-Vulkan-Tools-sdk-1.1.108.0_GH0.tar.gz) = cd9325346d535fc6fd5b6ab0b3e52c8ef91cadc534d8db729700745f18ba5678 +SIZE (KhronosGroup-Vulkan-Tools-sdk-1.1.108.0_GH0.tar.gz) = 615856 Index: head/devel/vulkan-tools/files/patch-vulkaninfo_CMakeLists.txt =================================================================== --- head/devel/vulkan-tools/files/patch-vulkaninfo_CMakeLists.txt (revision 505866) +++ head/devel/vulkan-tools/files/patch-vulkaninfo_CMakeLists.txt (nonexistent) @@ -1,24 +0,0 @@ ---- vulkaninfo/CMakeLists.txt.orig 2018-08-07 18:45:41 UTC -+++ vulkaninfo/CMakeLists.txt -@@ -28,7 +28,7 @@ else() - add_executable(vulkaninfo vulkaninfo.c) - endif() - --if(CMAKE_SYSTEM_NAME STREQUAL "Linux") -+if(UNIX AND NOT APPLE) - include(FindPkgConfig) - option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON) - option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON) -@@ -36,10 +36,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - - if(BUILD_WSI_XCB_SUPPORT) - find_package(XCB REQUIRED) -+ include_directories(SYSTEM ${XCB_INCLUDE_DIR}) - endif() - - if(BUILD_WSI_XLIB_SUPPORT) - find_package(X11 REQUIRED) -+ include_directories(SYSTEM ${X11_Xlib_INCLUDE_PATH}) - endif() - - if(VULKANINFO_WSI_SELECTION STREQUAL "XCB") Property changes on: head/devel/vulkan-tools/files/patch-vulkaninfo_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/vulkan-tools/files/patch-cube_CMakeLists.txt =================================================================== --- head/devel/vulkan-tools/files/patch-cube_CMakeLists.txt (revision 505866) +++ head/devel/vulkan-tools/files/patch-cube_CMakeLists.txt (revision 505867) @@ -1,33 +1,15 @@ ---- cube/CMakeLists.txt.orig 2018-08-07 18:44:03 UTC +--- cube/CMakeLists.txt.orig 2019-06-10 22:07:04 UTC +++ cube/CMakeLists.txt -@@ -48,7 +48,7 @@ else() - find_program(GLSLANG_VALIDATOR NAMES ${GLSLANG_VALIDATOR_NAME} HINTS "${PROJECT_SOURCE_DIR}/glslang/bin") - endif() +@@ -50,10 +50,12 @@ if(UNIX AND NOT APPLE) # i.e. Linux --if(CMAKE_SYSTEM_NAME STREQUAL "Linux") -+if(UNIX AND NOT APPLE) - include(FindPkgConfig) - option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON) - option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON) -@@ -58,10 +58,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - if(BUILD_WSI_XCB_SUPPORT) find_package(XCB REQUIRED) + include_directories(SYSTEM ${XCB_INCLUDE_DIR}) endif() if(BUILD_WSI_XLIB_SUPPORT) find_package(X11 REQUIRED) + include_directories(SYSTEM ${X11_Xlib_INCLUDE_PATH}) endif() if(BUILD_WSI_WAYLAND_SUPPORT) -@@ -87,7 +89,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") - endif() - elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") - add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR) --elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") -+elseif(UNIX AND NOT APPLE) - if(NOT CUBE_WSI_SELECTION) - set(CUBE_WSI_SELECTION "XCB") - endif() Index: head/devel/vulkan-tools/pkg-plist =================================================================== --- head/devel/vulkan-tools/pkg-plist (revision 505866) +++ head/devel/vulkan-tools/pkg-plist (revision 505867) @@ -1,3 +1,3 @@ -bin/cube -bin/cubepp +bin/vkcube +bin/vkcubepp bin/vulkaninfo Index: head/devel/vulkan-validation-layers/Makefile =================================================================== --- head/devel/vulkan-validation-layers/Makefile (revision 505866) +++ head/devel/vulkan-validation-layers/Makefile (revision 505867) @@ -1,31 +1,30 @@ # $FreeBSD$ PORTNAME= vulkan-validation-layers DISTVERSIONPREFIX= sdk- -DISTVERSION= 1.1.82.0 -PORTREVISION= 3 +DISTVERSION= 1.1.108.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 # 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 BUILD_WSI_MIR_SUPPORT + BUILD_WSI_WAYLAND_SUPPORT CMAKE_ARGS= -DGLSLANG_INSTALL_DIR=${LOCALBASE} .include Index: head/devel/vulkan-validation-layers/distinfo =================================================================== --- head/devel/vulkan-validation-layers/distinfo (revision 505866) +++ head/devel/vulkan-validation-layers/distinfo (revision 505867) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533665599 -SHA256 (KhronosGroup-Vulkan-ValidationLayers-sdk-1.1.82.0_GH0.tar.gz) = 6d83d1f7085bcfe67a791fce0bfb500dfb5d4833f062db1fc272bdc86e87eded -SIZE (KhronosGroup-Vulkan-ValidationLayers-sdk-1.1.82.0_GH0.tar.gz) = 962154 +TIMESTAMP = 1562247215 +SHA256 (KhronosGroup-Vulkan-ValidationLayers-sdk-1.1.108.0_GH0.tar.gz) = 7e286217cb0e83a86b563db9c3f9404d84fbdfcacd7976e865f616ebecfe5811 +SIZE (KhronosGroup-Vulkan-ValidationLayers-sdk-1.1.108.0_GH0.tar.gz) = 1187826 Index: head/devel/vulkan-validation-layers/files/patch-CMakeLists.txt =================================================================== --- head/devel/vulkan-validation-layers/files/patch-CMakeLists.txt (revision 505866) +++ head/devel/vulkan-validation-layers/files/patch-CMakeLists.txt (nonexistent) @@ -1,23 +0,0 @@ ---- CMakeLists.txt.orig 2018-07-30 17:53:08 UTC -+++ CMakeLists.txt -@@ -63,9 +63,9 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) - # "Helper" targets that don't have interesting source code should set their FOLDER property to this - set(LAYERS_HELPER_FOLDER "Helper Targets") - --if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") -+if(UNIX) - set( -- FALLBACK_CONFIG_DIRS "/etc/xdg" -+ FALLBACK_CONFIG_DIRS "${CMAKE_INSTALL_PREFIX}/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." -@@ -78,7 +78,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_ - ) - endif() - --if(CMAKE_SYSTEM_NAME STREQUAL "Linux") -+if(UNIX AND NOT APPLE) - include(FindPkgConfig) - option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON) - option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON) Property changes on: head/devel/vulkan-validation-layers/files/patch-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/vulkan-validation-layers/files/patch-layers_CMakeLists.txt =================================================================== --- head/devel/vulkan-validation-layers/files/patch-layers_CMakeLists.txt (revision 505866) +++ head/devel/vulkan-validation-layers/files/patch-layers_CMakeLists.txt (nonexistent) @@ -1,20 +0,0 @@ ---- layers/CMakeLists.txt.orig 2018-07-30 17:53:08 UTC -+++ layers/CMakeLists.txt -@@ -23,7 +23,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(UNIX AND NOT APPLE) - if(BUILD_WSI_XCB_SUPPORT) - add_definitions(-DVK_USE_PLATFORM_XCB_KHR -DVK_USE_PLATFORM_XCB_KHX) - endif() -@@ -131,7 +131,7 @@ if(WIN32) - add_custom_target(vk_validation_error_messages ALL COMMAND copy ${src_val_msgs} ${dst_val_msgs} VERBATIM) - set_target_properties(vk_validation_error_messages PROPERTIES FOLDER ${LAYERS_HELPER_FOLDER}) - endif() --elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") -+ elseif(UNIX AND NOT APPLE) - # extra setup for out-of-tree builds - if(NOT (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)) - foreach(config_file ${LAYER_JSON_FILES}) Property changes on: head/devel/vulkan-validation-layers/files/patch-layers_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/vulkan-validation-layers/pkg-plist =================================================================== --- head/devel/vulkan-validation-layers/pkg-plist (revision 505866) +++ head/devel/vulkan-validation-layers/pkg-plist (revision 505867) @@ -1,35 +1,38 @@ +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_object_tracker.so -lib/libVkLayer_parameter_validation.so -lib/libVkLayer_threading.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 share/vulkan/explicit_layer.d/VkLayer_core_validation.json -share/vulkan/explicit_layer.d/VkLayer_object_tracker.json -share/vulkan/explicit_layer.d/VkLayer_parameter_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_threading.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 Index: head/emulators/rpcs3/Makefile =================================================================== --- head/emulators/rpcs3/Makefile (revision 505866) +++ head/emulators/rpcs3/Makefile (revision 505867) @@ -1,84 +1,85 @@ # $FreeBSD$ PORTNAME= rpcs3 DISTVERSIONPREFIX= v DISTVERSION= 0.0.6-8329 # git rev-list --count HEAD DISTVERSIONSUFFIX= -gad10eb391 +PORTREVISION= 1 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org COMMENT= PS3 emulator/debugger LICENSE= BSD3CLAUSE BSL GPLv2 MIT ZLIB LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE=${WRKSRC_cereal}/LICENSE LICENSE_FILE_MIT= ${WRKSRC_GSL}/LICENSE LICENSE_FILE_ZLIB= ${WRKSRC_asmjit}/LICENSE.md LIB_DEPENDS= libpng.so:graphics/png \ libavcodec.so:multimedia/ffmpeg ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= requires int128 and SSE2 USE_GITHUB= yes GH_ACCOUNT= RPCS3 GH_TUPLE= RPCS3:hidapi:hidapi-0.8.0-rc1-27-g9220f5e:hidapi/3rdparty/hidapi \ RPCS3:llvm:b860b5e8f4ee:llvm/llvm \ Cyan4973:xxHash:v0.6.5:xxHash/3rdparty/xxHash \ jbeder:yaml-cpp:yaml-cpp-0.6.2-23-geca9cfd:yamlcpp/3rdparty/yaml-cpp \ kobalicek:asmjit:fc251c9:asmjit/asmjit \ KhronosGroup:glslang:7.11.3214:glslang/Vulkan/glslang \ Microsoft:GSL:v2.0.0:GSL/3rdparty/GSL \ USCiLab:cereal:v1.2.0:cereal/3rdparty/cereal \ zeux:pugixml:v1.9-51-g8bf806c:pugixml/3rdparty/pugixml USES= cmake compiler:c++17-lang iconv:wchar_t localbase:ldflags \ openal:soft pkgconfig qt:5 USE_GL= gl glew USE_QT= qmake_build buildtools_build core dbus declarative gui network widgets USE_XORG= x11 LLD_UNSAFE= yes # XXX ports/219089 CMAKE_ON= CMAKE_SKIP_RPATH USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG CMAKE_OFF= USE_NATIVE_INSTRUCTIONS LDFLAGS+= -Wl,--as-needed # GLU # XXX Remove after FreeBSD 11.2/12.0 reach EOL i.e., around 2020-02-01 .if !exists(/usr/include/c++/v1/charconv) && exists(/usr/lib/libc++.so) EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-revert-f9ad6358563b .endif OPTIONS_DEFINE= ALSA EVDEV GDB LLVM PULSEAUDIO VULKAN OPTIONS_DEFAULT=ALSA LLVM VULKAN ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins ALSA_CMAKE_BOOL= USE_ALSA EVDEV_DESC= libevdev-based joystick support EVDEV_CMAKE_BOOL= USE_LIBEVDEV EVDEV_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev GDB_DESC= GDB remote stub (powerpc64 target) GDB_CMAKE_BOOL= WITH_GDB GDB_BROKEN= https://github.com/RPCS3/rpcs3/issues/5946 LLVM_DESC= LLVM-based PPU recompiler LLVM_CMAKE_BOOL_OFF= WITHOUT_LLVM PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE VULKAN_DESC= Vulkan renderer VULKAN_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_CMAKE_BOOL= USE_VULKAN post-patch: @${REINPLACE_CMD} -e '/GIT_BRANCH/s/unknown/master/' \ -e '/GIT_TAG/s/unknown/${GH_TAGNAME:C/-.*//}/' \ -e '/GIT_VERSION/s/unknown/${GH_TAGNAME:C/[^-]*-//}/' \ ${WRKSRC}/${PORTNAME}/git-version.cmake .include Index: head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKHelpers.h =================================================================== --- head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKHelpers.h (revision 505866) +++ head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKHelpers.h (nonexistent) @@ -1,58 +0,0 @@ -In file included from rpcs3/Emu/RSX/VK/VKFormats.cpp:2: -In file included from rpcs3/Emu/RSX/VK/VKFormats.h:2: -rpcs3/Emu/RSX/VK/VKHelpers.h:465:3: error: unknown type name 'VkPhysicalDeviceDriverPropertiesKHR'; did you mean 'VkPhysicalDeviceGroupPropertiesKHR'? - VkPhysicalDeviceDriverPropertiesKHR driver_properties{}; - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - VkPhysicalDeviceGroupPropertiesKHR - ---- rpcs3/Emu/RSX/VK/VKHelpers.h.orig 2019-06-29 15:48:42 UTC -+++ rpcs3/Emu/RSX/VK/VKHelpers.h -@@ -47,6 +47,48 @@ - #define FRAME_PRESENT_TIMEOUT 1000000ull // 1 second - #define GENERAL_WAIT_TIMEOUT 100000ull // 100ms - -+#if VK_HEADER_VERSION < 92 -+#define VK_MAX_DRIVER_NAME_SIZE_KHR 256 -+#define VK_MAX_DRIVER_INFO_SIZE_KHR 256 -+ -+#define VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR (VkStructureType)1000196000 -+ -+typedef enum VkDriverIdKHR { -+ VK_DRIVER_ID_AMD_PROPRIETARY_KHR = 1, -+ VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR = 2, -+ VK_DRIVER_ID_MESA_RADV_KHR = 3, -+ VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR = 4, -+ VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS_KHR = 5, -+ VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR = 6, -+ VK_DRIVER_ID_IMAGINATION_PROPRIETARY_KHR = 7, -+ VK_DRIVER_ID_QUALCOMM_PROPRIETARY_KHR = 8, -+ VK_DRIVER_ID_ARM_PROPRIETARY_KHR = 9, -+ VK_DRIVER_ID_GOOGLE_SWIFTSHADER_KHR = 10, -+ VK_DRIVER_ID_GGP_PROPRIETARY_KHR = 11, -+ VK_DRIVER_ID_BROADCOM_PROPRIETARY_KHR = 12, -+ VK_DRIVER_ID_BEGIN_RANGE_KHR = VK_DRIVER_ID_AMD_PROPRIETARY_KHR, -+ VK_DRIVER_ID_END_RANGE_KHR = VK_DRIVER_ID_BROADCOM_PROPRIETARY_KHR, -+ VK_DRIVER_ID_RANGE_SIZE_KHR = (VK_DRIVER_ID_BROADCOM_PROPRIETARY_KHR - VK_DRIVER_ID_AMD_PROPRIETARY_KHR + 1), -+ VK_DRIVER_ID_MAX_ENUM_KHR = 0x7FFFFFFF -+} VkDriverIdKHR; -+ -+typedef struct VkConformanceVersionKHR { -+ uint8_t major; -+ uint8_t minor; -+ uint8_t subminor; -+ uint8_t patch; -+} VkConformanceVersionKHR; -+ -+typedef struct VkPhysicalDeviceDriverPropertiesKHR { -+ VkStructureType sType; -+ void* pNext; -+ VkDriverIdKHR driverID; -+ char driverName[VK_MAX_DRIVER_NAME_SIZE_KHR]; -+ char driverInfo[VK_MAX_DRIVER_INFO_SIZE_KHR]; -+ VkConformanceVersionKHR conformanceVersion; -+} VkPhysicalDeviceDriverPropertiesKHR; -+#endif -+ - namespace rsx - { - class fragment_texture; Property changes on: head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKHelpers.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VulkanAPI.h =================================================================== --- head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VulkanAPI.h (revision 505866) +++ head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VulkanAPI.h (nonexistent) @@ -1,31 +0,0 @@ -Revert https://github.com/RPCS3/rpcs3/commit/39fa1d7031e3 to unbreak -with devel/vulkan-headers < 1.1.96 - -In file included from rpcs3/Emu/RSX/VK/VKFormats.cpp:2: -In file included from rpcs3/Emu/RSX/VK/VKFormats.h:2: -rpcs3/Emu/RSX/VK/VKHelpers.h:603:5: error: unknown type name 'VkPhysicalDeviceFloat16Int8FeaturesKHR'; did you mean 'VkPhysicalDeviceMultiviewFeaturesKHR'? - VkPhysicalDeviceFloat16Int8FeaturesKHR shader_support_info{}; - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ---- rpcs3/Emu/RSX/VK/VulkanAPI.h.orig 2019-06-10 11:57:03 UTC -+++ rpcs3/Emu/RSX/VK/VulkanAPI.h -@@ -14,6 +14,19 @@ - #include "define_new_memleakdetect.h" - #include "Utilities/types.h" - -+#if VK_HEADER_VERSION < 95 -+ -+typedef struct VkPhysicalDeviceFloat16Int8FeaturesKHR { -+ VkStructureType sType; -+ void* pNext; -+ VkBool32 shaderFloat16; -+ VkBool32 shaderInt8; -+} VkPhysicalDeviceFloat16Int8FeaturesKHR; -+ -+#define VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR VkStructureType(1000082000) -+ -+#endif -+ - namespace vk - { - void init(); Property changes on: head/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VulkanAPI.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/vkquake/Makefile =================================================================== --- head/games/vkquake/Makefile (revision 505866) +++ head/games/vkquake/Makefile (revision 505867) @@ -1,97 +1,98 @@ # $FreeBSD$ PORTNAME= vkquake DISTVERSION= 1.00.0 +PORTREVISION= 1 CATEGORIES= games 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 pkgconfig USE_SDL= sdl2 USE_GITHUB= yes GH_ACCOUNT= Novum GH_PROJECT= vkQuake INSTALLS_ICONS= yes MAKE_ENV= prefix=${PREFIX} bindir=${PREFIX}/bin 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=mad MP3_MAKE_ARGS_OFF= USE_CODEC_MP3=0 MP3_LIB_DEPENDS= libmad.so:audio/libmad 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/graphics/gstreamer1-plugins-vulkan/Makefile =================================================================== --- head/graphics/gstreamer1-plugins-vulkan/Makefile (revision 505866) +++ head/graphics/gstreamer1-plugins-vulkan/Makefile (revision 505867) @@ -1,13 +1,13 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics COMMENT= GStreamer Vulkan graphics plugin GST_PLUGIN= vulkan DIST= bad MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins .include "${MASTERDIR}/Makefile" Index: head/graphics/libplacebo/Makefile =================================================================== --- head/graphics/libplacebo/Makefile (revision 505866) +++ head/graphics/libplacebo/Makefile (revision 505867) @@ -1,51 +1,52 @@ # $FreeBSD$ PORTNAME= libplacebo DISTVERSIONPREFIX= v DISTVERSION= 1.18.0 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Reusable library for GPU-accelerated video/image rendering LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c11 localbase:ldflags meson pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= haasn OPTIONS_DEFINE= LCMS2 TEST VULKAN OPTIONS_DEFAULT=LCMS2 SHADERC OPTIONS_SINGLE= VULKAN OPTIONS_SINGLE_VULKAN= GLSLANG SHADERC GLSLANG_DESC= glslang SPIR-V compiler GLSLANG_BUILD_DEPENDS= glslang>0:devel/glslang GLSLANG_MESON_ENABLED= glslang GLSLANG_IMPLIES= VULKAN LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS2_MESON_ENABLED= lcms SHADERC_DESC= libshaderc SPIR-V compiler SHADERC_LIB_DEPENDS= libshaderc_shared.so:graphics/shaderc SHADERC_MESON_ENABLED= shaderc SHADERC_IMPLIES= VULKAN TEST_MESON_TRUE= tests VULKAN_DESC= Vulkan-based renderer VULKAN_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_MESON_ENABLED= vulkan post-patch: # Extract (snapshot) version from port version instead of meson.build @${REINPLACE_CMD} "s/version_pretty/'${DISTVERSIONFULL}'/" \ ${WRKSRC}/src/meson.build pre-install-TEST-on: do-test .include Index: head/graphics/shaderc/Makefile =================================================================== --- head/graphics/shaderc/Makefile (revision 505866) +++ head/graphics/shaderc/Makefile (revision 505867) @@ -1,37 +1,38 @@ # $FreeBSD$ PORTNAME= shaderc DISTVERSIONPREFIX=v DISTVERSION= 2018.0 +PORTREVISION= 1 CATEGORIES= graphics devel PATCH_SITES= https://github.com/haasn/${GH_PROJECT}/commit/ PATCHFILES= 21c8be385b3f.patch:-p1 MAINTAINER= greg@unrelenting.technology COMMENT= GLSL/HLSL to SPIR-V shader compiler LICENSE= APACHE20 BUILD_DEPENDS= ${LOCALBASE}/lib/libSPIRV-Tools-opt.a:devel/spirv-tools \ ${LOCALBASE}/lib/libHLSL.a:devel/glslang USES= cmake compiler:c++11-lib pkgconfig localbase:ldflags python:build USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= google CMAKE_ON+= SHADERC_SKIP_TESTS CMAKE_OFF+= SHADERC_ENABLE_NV_EXTENSIONS CMAKE_ARGS+= -DPYTHON_EXE:STRING="${PYTHON_CMD}" CFLAGS+= -Wno-ignored-attributes -Wno-c++11-narrowing # https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/shaderc post-patch: ${REINPLACE_CMD} '/examples/d;/third_party/d' ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} '/build-version/d' ${WRKSRC}/glslc/CMakeLists.txt ${ECHO} "\"${DISTVERSIONFULL}\"" > ${WRKSRC}/glslc/src/build-version.inc .include Index: head/graphics/vkd3d/Makefile =================================================================== --- head/graphics/vkd3d/Makefile (revision 505866) +++ head/graphics/vkd3d/Makefile (revision 505867) @@ -1,37 +1,37 @@ # $FreeBSD$ PORTNAME= vkd3d PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= https://dl.winehq.org/${PORTNAME}/source/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= jbeich@FreeBSD.org COMMENT= Direct3D 12 to Vulkan translation LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/spirv-tools/libspirv.h:devel/spirv-tools \ ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers LIB_DEPENDS= libSPIRV-Tools-shared.so:devel/spirv-tools \ libvulkan.so:graphics/vulkan-loader RUN_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers USES= gmake libtool localbase pkgconfig tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-spirv-tools TEST_TARGET= check # XXX Move to a separate port (a la devel/vulkan-headers) and maybe make # devel/spirv-tools depend on it as well USE_GITHUB= nodefault -GH_TUPLE= KhronosGroup:SPIRV-Headers:4618b86e9e4b0:headers/external/spirv-headers +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.4.1:headers/external/spirv-headers CPPFLAGS+= -isystem${WRKSRC}/external/spirv-headers/include post-patch: @${REINPLACE_CMD} '/libdl not found/d' ${WRKSRC}/configure .include Index: head/graphics/vkd3d/distinfo =================================================================== --- head/graphics/vkd3d/distinfo (revision 505866) +++ head/graphics/vkd3d/distinfo (revision 505867) @@ -1,5 +1,5 @@ TIMESTAMP = 1538761416 SHA256 (vkd3d-1.1.tar.xz) = 495adc61cc80c65d54b2f5b52092ea05d3797cc2c17a610f0fc98457d2f56ab6 SIZE (vkd3d-1.1.tar.xz) = 487452 -SHA256 (KhronosGroup-SPIRV-Headers-4618b86e9e4b0_GH0.tar.gz) = c8b276d27380bcb0ab019688c7b061af89c402176429639f9b88743366f2f1ba -SIZE (KhronosGroup-SPIRV-Headers-4618b86e9e4b0_GH0.tar.gz) = 322977 +SHA256 (KhronosGroup-SPIRV-Headers-1.4.1_GH0.tar.gz) = a244f0629f75eb450e090cd773d30e22367cb231e964c7492588eb9000201fd1 +SIZE (KhronosGroup-SPIRV-Headers-1.4.1_GH0.tar.gz) = 359347 Index: head/graphics/vulkan-loader/Makefile =================================================================== --- head/graphics/vulkan-loader/Makefile (revision 505866) +++ head/graphics/vulkan-loader/Makefile (revision 505867) @@ -1,48 +1,47 @@ # $FreeBSD$ PORTNAME= vulkan-loader DISTVERSIONPREFIX=sdk- -DISTVERSION= 1.1.82.0 -PORTREVISION= 3 +DISTVERSION= 1.1.108.0 CATEGORIES= graphics devel 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: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 BUILD_WSI_MIR_SUPPORT +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: # Non-x86 targets use C code, so don't abort without GNU as (e.g., on aarch64) .if !exists(/usr/bin/as) && ${MACHINE_ARCH} != i386 && ${MACHINE_ARCH} != amd64 @${REINPLACE_CMD} 's/-ATT//' ${WRKSRC}/loader/CMakeLists.txt .endif .include Index: head/graphics/vulkan-loader/distinfo =================================================================== --- head/graphics/vulkan-loader/distinfo (revision 505866) +++ head/graphics/vulkan-loader/distinfo (revision 505867) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533664679 -SHA256 (KhronosGroup-Vulkan-Loader-sdk-1.1.82.0_GH0.tar.gz) = 86cd3e93d99cbfbb8550e7f2137cacfdaf9aa6611b814e054b2156b4b4775b0c -SIZE (KhronosGroup-Vulkan-Loader-sdk-1.1.82.0_GH0.tar.gz) = 1341774 +TIMESTAMP = 1562258759 +SHA256 (KhronosGroup-Vulkan-Loader-sdk-1.1.108.0_GH0.tar.gz) = cf8c8965b51ddb4cc905d4f7370324de54e17366a8dfaf96c0a922e9c32d3817 +SIZE (KhronosGroup-Vulkan-Loader-sdk-1.1.108.0_GH0.tar.gz) = 1342959 Index: head/graphics/vulkan-loader/files/patch-CMakeLists.txt =================================================================== --- head/graphics/vulkan-loader/files/patch-CMakeLists.txt (revision 505866) +++ head/graphics/vulkan-loader/files/patch-CMakeLists.txt (revision 505867) @@ -1,36 +1,24 @@ ---- CMakeLists.txt.orig 2018-08-03 22:10:42 UTC +--- CMakeLists.txt.orig 2019-06-11 17:20:18 UTC +++ CMakeLists.txt -@@ -57,9 +57,9 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) - # "Helper" targets that don't have interesting source code should set their FOLDER property to this - set(LOADER_HELPER_FOLDER "Helper Targets") +@@ -77,7 +77,7 @@ set(LOADER_HELPER_FOLDER "Helper Targets") --if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") -+if(UNIX AND NOT APPLE) + if(UNIX) set( - FALLBACK_CONFIG_DIRS "/etc/xdg" + FALLBACK_CONFIG_DIRS "${CMAKE_INSTALL_PREFIX}/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." -@@ -72,7 +72,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_ - ) - endif() - --if(CMAKE_SYSTEM_NAME STREQUAL "Linux") -+if(UNIX AND NOT APPLE) - include(FindPkgConfig) - option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON) - option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON) -@@ -81,10 +81,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") +@@ -97,10 +97,12 @@ if(UNIX AND NOT APPLE) # i.e.: Linux if(BUILD_WSI_XCB_SUPPORT) find_package(XCB REQUIRED) + include_directories(SYSTEM ${XCB_INCLUDE_DIR}) endif() if(BUILD_WSI_XLIB_SUPPORT) find_package(X11 REQUIRED) + include_directories(SYSTEM ${X11_Xlib_INCLUDE_PATH}) endif() if(BUILD_WSI_WAYLAND_SUPPORT) Index: head/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt =================================================================== --- head/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt (revision 505866) +++ head/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt (revision 505867) @@ -1,20 +1,11 @@ ---- loader/CMakeLists.txt.orig 2018-08-03 22:10:42 UTC +--- loader/CMakeLists.txt.orig 2019-06-11 17:20:18 UTC +++ loader/CMakeLists.txt -@@ -40,7 +40,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") - endif() - elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") - add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR) --elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") -+elseif(UNIX AND NOT APPLE) - if(BUILD_WSI_XCB_SUPPORT) - add_definitions(-DVK_USE_PLATFORM_XCB_KHR) - endif() -@@ -223,7 +223,7 @@ else() - add_dependencies(vulkan generate_helper_files loader_gen_files loader_asm_gen_files) - target_compile_definitions(vulkan PUBLIC -DLOADER_DYNAMIC_LIB) - set_target_properties(vulkan PROPERTIES SOVERSION "1" VERSION "${VulkanHeaders_VERSION_MAJOR}.${VulkanHeaders_VERSION_MINOR}.${VulkanHeaders_VERSION_PATCH}") +@@ -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 ${CMAKE_DL_LIBS} -lpthread -lm) + target_link_libraries(vulkan Vulkan::Headers) if(APPLE) - find_library(COREFOUNDATION_LIBRARY NAMES CoreFoundation) Index: head/graphics/vulkan-loader/pkg-plist =================================================================== --- head/graphics/vulkan-loader/pkg-plist (revision 505866) +++ head/graphics/vulkan-loader/pkg-plist (revision 505867) @@ -1,4 +1,4 @@ lib/libvulkan.so lib/libvulkan.so.1 -lib/libvulkan.so.1.1.82 +lib/libvulkan.so.1.1.108 libdata/pkgconfig/vulkan.pc Index: head/multimedia/mpv/Makefile =================================================================== --- head/multimedia/mpv/Makefile (revision 505866) +++ head/multimedia/mpv/Makefile (revision 505867) @@ -1,200 +1,200 @@ # Created by: Grzegorz Blach # $FreeBSD$ PORTNAME= mpv PORTVERSION= 0.29.1 DISTVERSIONPREFIX= v -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= multimedia audio MASTER_SITES= https://waf.io/:waf DISTFILES= ${WAF_RELEASE}${EXTRACT_SUFX}:waf MAINTAINER= cpm@FreeBSD.org COMMENT= Free and open-source general-purpose video player LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi BUILD_DEPENDS= ffmpeg>=4.0.2,1:multimedia/ffmpeg LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg USES= compiler:c11 desktop-file-utils iconv jpeg localbase:ldflags \ pkgconfig python:build tar:bz2 waf USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= mpv-player # Keep in sync with bootstrap.py to avoid regressions WAF_CMD= ${WRKDIR}/${WAF_RELEASE}/waf-light WAF_RELEASE= waf-2.0.9 CONFIGURE_ENV= BIN_PYTHON="${PYTHON_CMD}" CONFIGURE_ARGS= --docdir="${EXAMPLESDIR}" \ --htmldir="${DOCSDIR}/html" \ --mandir="${MANPREFIX}/man" \ --disable-debug-build \ --disable-optimize \ --disable-pdf \ --disable-rubberband \ --disable-vapoursynth \ --disable-vapoursynth-lazy \ --enable-libmpv-shared OPTIONS_DEFINE= ARCHIVE ASS DOCS LCMS2 LUAJIT MANPAGES TEST UCHARDET ZSH EXAMPLES OPTIONS_DEFAULT= ARCHIVE ASS DVDREAD DVDNAV MANPAGES OPENGL UCHARDET \ V4L VAAPI VDPAU VULKAN WAYLAND X11 YTDL OPTIONS_GROUP= IN VO AO OPTIONS_GROUP_IN= CDIO DVDREAD DVDNAV LIBBLURAY V4L YTDL SMB OPTIONS_GROUP_VO= CACA OPENGL VAAPI VDPAU VULKAN WAYLAND X11 OPTIONS_GROUP_AO= ALSA JACK OPENAL PULSEAUDIO SDL SNDIO OPTIONS_SUB= yes ASS_DESC= ASS/SSA subtitle and OSD rendering DVDREAD_DESC= DVD Playback support DVDNAV_DESC= DVD menu navigation LUAJIT_DESC= Use LuaJIT instead of Lua scripting language support UCHARDET_DESC= Guess subtitle encoding via uchardet VULKAN_DESC= Vulkan output support WAYLAND_DESC= Wayland (graphics) support YTDL_DESC= Install youtube-dl IN_DESC= Input VO_DESC= Video Output AO_DESC= Audio Output ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_OFF= --disable-alsa ARCHIVE_USES= libarchive ARCHIVE_CONFIGURE_ON= --enable-libarchive ASS_LIB_DEPENDS= libass.so:multimedia/libass ASS_CONFIGURE_OFF= --disable-libass CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca CACA_CONFIGURE_OFF= --disable-caca CDIO_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia CDIO_CONFIGURE_ON= --enable-cdda DOCS_BUILD_DEPENDS= rst2html:textproc/py-docutils DOCS_CONFIGURE_ON= --enable-html DVDNAV_LIB_DEPENDS= libdvdnav.so:multimedia/libdvdnav DVDNAV_CONFIGURE_ON= --enable-dvdnav DVDREAD_LIB_DEPENDS= libdvdread.so:multimedia/libdvdread DVDREAD_CONFIGURE_ON= --enable-dvdread JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_OFF= --disable-jack LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS2_CONFIGURE_OFF= --disable-lcms2 LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray LIBBLURAY_CONFIGURE_ON= --enable-libbluray LIBBLURAY_CONFIGURE_OFF= --disable-libbluray LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit LUAJIT_USES_OFF= lua LUAJIT_CONFIGURE_ON= --lua=luajit LUAJIT_CONFIGURE_OFF= --lua=${LUA_VER_STR}fbsd MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils MANPAGES_CONFIGURE_OFF= --disable-manpage OPENAL_CONFIGURE_ENABLE= openal OPENAL_USES= openal OPENAL_VARS= LLD_UNSAFE=yes # cf. PR 226980 OPENGL_USES= gl OPENGL_USE= GL=egl,gbm,gl OPENGL_CONFIGURE_OFF= --disable-gl OPENGL_IMPLIES= X11 PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_OFF= --disable-pulse SDL_USE= SDL=sdl2 SDL_CONFIGURE_ON= --enable-sdl2 SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CONFIGURE_ON= --enable-sndio SNDIO_CONFIGURE_OFF= --disable-sndio SMB_USES= samba:lib SMB_CONFIGURE_ON= --enable-libsmbclient TEST_BUILD_DEPENDS= cmocka>=1.1.0:sysutils/cmocka TEST_CONFIGURE_ON= --enable-test TEST_UNITTESTFILES= chmap chmap_sel gl_video UCHARDET_LIB_DEPENDS= libuchardet.so:textproc/uchardet UCHARDET_CONFIGURE_OFF= --disable-uchardet V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l V4L_CONFIGURE_ON= --enable-tv --enable-dvbin VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VAAPI_CONFIGURE_OFF= --disable-vaapi VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_CONFIGURE_OFF= --disable-vdpau VULKAN_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader \ libshaderc_shared.so:graphics/shaderc VULKAN_CONFIGURE_OFF= --disable-vulkan --disable-shaderc VULKAN_IMPLIES= X11 WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.14:graphics/wayland-protocols \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libwayland-cursor.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon WAYLAND_CONFIGURE_OFF= --disable-wayland X11_USES= gnome X11_USE= XORG=x11,xext,xinerama,xorgproto,xrandr,xscrnsaver,xv,xxf86vm X11_VARS= INSTALLS_ICONS=yes X11_CONFIGURE_OFF= --disable-x11 YTDL_RUN_DEPENDS= youtube-dl:www/youtube_dl ZSH_USES= perl5 ZSH_USE= PERL5=build ZSH_CONFIGURE_ENV= BIN_PERL="${PERL}" ZSH_CONFIGURE_ENABLE= zsh-comp .include .if ${PORT_OPTIONS:MVAAPI} && ${PORT_OPTIONS:MWAYLAND} CONFIGURE_ARGS+= --enable-vaapi-wayland LIB_DEPENDS+= libva-wayland.so:multimedia/libva .else CONFIGURE_ARGS+= --disable-vaapi-wayland .endif post-patch: @${REINPLACE_CMD} -e 's|/pkgconfig/mpv.pc|data/pkgconfig/mpv.pc|g' \ ${WRKSRC}/wscript_build.py @${REINPLACE_CMD} -e 's|DBL_EPSILON|FLT_EPSILON|'g \ ${WRKSRC}/test/test_helpers.h post-patch-MANPAGES-on: @${FIND} ${WRKSRC}/DOCS/man -name '*.rst' | ${XARGS} ${REINPLACE_CMD} \ -e 's|/usr/local|${PREFIX}|g' pre-install-TEST-on: .for test in ${TEST_UNITTESTFILES} cd ${WRKSRC}/build/test && ./${test} .endfor post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mpv @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmpv.so .include