diff options
33 files changed, 75 insertions, 261 deletions
diff --git a/devel/glslang/Makefile b/devel/glslang/Makefile index 3ee487ff486e..118871fe7b6a 100644 --- a/devel/glslang/Makefile +++ b/devel/glslang/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= glslang -DISTVERSION= 7.10.2984 +DISTVERSION= 7.11.3214 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology diff --git a/devel/glslang/distinfo b/devel/glslang/distinfo index bd04edd71618..e452c5974003 100644 --- a/devel/glslang/distinfo +++ b/devel/glslang/distinfo @@ -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 diff --git a/devel/spirv-tools/Makefile b/devel/spirv-tools/Makefile index 4e2231433e2d..e3a5546282e8 100644 --- a/devel/spirv-tools/Makefile +++ b/devel/spirv-tools/Makefile @@ -2,7 +2,7 @@ PORTNAME= spirv-tools DISTVERSIONPREFIX= v -DISTVERSION= 2018.6 +DISTVERSION= 2019.3 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology @@ -10,14 +10,14 @@ 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 diff --git a/devel/spirv-tools/distinfo b/devel/spirv-tools/distinfo index 8fdeab23e0b5..2f43dd6830ef 100644 --- a/devel/spirv-tools/distinfo +++ b/devel/spirv-tools/distinfo @@ -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 diff --git a/devel/spirv-tools/pkg-plist b/devel/spirv-tools/pkg-plist index 8de4753ea38e..0a5a16d7c060 100644 --- a/devel/spirv-tools/pkg-plist +++ b/devel/spirv-tools/pkg-plist @@ -4,14 +4,17 @@ 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 diff --git a/devel/vulkan-headers/Makefile b/devel/vulkan-headers/Makefile index 6b423d99331c..cf801b145acf 100644 --- a/devel/vulkan-headers/Makefile +++ b/devel/vulkan-headers/Makefile @@ -2,7 +2,7 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX=sdk- -DISTVERSION= 1.1.82.0 +DISTVERSION= 1.1.108.0 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology diff --git a/devel/vulkan-headers/distinfo b/devel/vulkan-headers/distinfo index bcd6a2a6c5c6..4da6b74c3d3c 100644 --- a/devel/vulkan-headers/distinfo +++ b/devel/vulkan-headers/distinfo @@ -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 diff --git a/devel/vulkan-headers/pkg-plist b/devel/vulkan-headers/pkg-plist index dbd4bff5162c..9634bbb4bb82 100644 --- a/devel/vulkan-headers/pkg-plist +++ b/devel/vulkan-headers/pkg-plist @@ -6,9 +6,11 @@ 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 @@ -16,8 +18,10 @@ 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 diff --git a/devel/vulkan-tools/Makefile b/devel/vulkan-tools/Makefile index 2e31de9a8269..8a0119c84dce 100644 --- a/devel/vulkan-tools/Makefile +++ b/devel/vulkan-tools/Makefile @@ -2,8 +2,7 @@ PORTNAME= vulkan-tools DISTVERSIONPREFIX= sdk- -DISTVERSION= 1.1.82.0 -PORTREVISION= 2 +DISTVERSION= 1.1.108.0 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology @@ -13,19 +12,17 @@ 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 <bsd.port.mk> diff --git a/devel/vulkan-tools/distinfo b/devel/vulkan-tools/distinfo index 9c568bd8f186..8f7c04c88952 100644 --- a/devel/vulkan-tools/distinfo +++ b/devel/vulkan-tools/distinfo @@ -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 diff --git a/devel/vulkan-tools/files/patch-cube_CMakeLists.txt b/devel/vulkan-tools/files/patch-cube_CMakeLists.txt index f8e77a950794..a3450eaf00e0 100644 --- a/devel/vulkan-tools/files/patch-cube_CMakeLists.txt +++ b/devel/vulkan-tools/files/patch-cube_CMakeLists.txt @@ -1,15 +1,6 @@ ---- 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() - --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") +@@ -50,10 +50,12 @@ if(UNIX AND NOT APPLE) # i.e. Linux if(BUILD_WSI_XCB_SUPPORT) find_package(XCB REQUIRED) @@ -22,12 +13,3 @@ 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() diff --git a/devel/vulkan-tools/files/patch-vulkaninfo_CMakeLists.txt b/devel/vulkan-tools/files/patch-vulkaninfo_CMakeLists.txt deleted file mode 100644 index cbcb21243dc4..000000000000 --- a/devel/vulkan-tools/files/patch-vulkaninfo_CMakeLists.txt +++ /dev/null @@ -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") diff --git a/devel/vulkan-tools/pkg-plist b/devel/vulkan-tools/pkg-plist index 737367b78660..1419af7e32d6 100644 --- a/devel/vulkan-tools/pkg-plist +++ b/devel/vulkan-tools/pkg-plist @@ -1,3 +1,3 @@ -bin/cube -bin/cubepp +bin/vkcube +bin/vkcubepp bin/vulkaninfo diff --git a/devel/vulkan-validation-layers/Makefile b/devel/vulkan-validation-layers/Makefile index f4bab4fcedd2..752f46734d25 100644 --- a/devel/vulkan-validation-layers/Makefile +++ b/devel/vulkan-validation-layers/Makefile @@ -2,8 +2,7 @@ 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 @@ -25,7 +24,7 @@ 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 <bsd.port.mk> diff --git a/devel/vulkan-validation-layers/distinfo b/devel/vulkan-validation-layers/distinfo index dd1afc6d9441..64e5a021fc12 100644 --- a/devel/vulkan-validation-layers/distinfo +++ b/devel/vulkan-validation-layers/distinfo @@ -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 diff --git a/devel/vulkan-validation-layers/files/patch-CMakeLists.txt b/devel/vulkan-validation-layers/files/patch-CMakeLists.txt deleted file mode 100644 index 2948c3d9d9d5..000000000000 --- a/devel/vulkan-validation-layers/files/patch-CMakeLists.txt +++ /dev/null @@ -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) diff --git a/devel/vulkan-validation-layers/files/patch-layers_CMakeLists.txt b/devel/vulkan-validation-layers/files/patch-layers_CMakeLists.txt deleted file mode 100644 index 67b9c05d8408..000000000000 --- a/devel/vulkan-validation-layers/files/patch-layers_CMakeLists.txt +++ /dev/null @@ -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}) diff --git a/devel/vulkan-validation-layers/pkg-plist b/devel/vulkan-validation-layers/pkg-plist index 41645d26c7f6..bde276028076 100644 --- a/devel/vulkan-validation-layers/pkg-plist +++ b/devel/vulkan-validation-layers/pkg-plist @@ -1,3 +1,4 @@ +include/cast_utils.h include/hash_util.h include/hash_vk_types.h include/vk_dispatch_table_helper.h @@ -22,14 +23,16 @@ 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 diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 6baa6bf77d86..37107b318ef4 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -4,6 +4,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v DISTVERSION= 0.0.6-8329 # git rev-list --count HEAD DISTVERSIONSUFFIX= -gad10eb391 +PORTREVISION= 1 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org diff --git a/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKHelpers.h b/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKHelpers.h deleted file mode 100644 index f1ed0e33d8ad..000000000000 --- a/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKHelpers.h +++ /dev/null @@ -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; diff --git a/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VulkanAPI.h b/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VulkanAPI.h deleted file mode 100644 index 808a84bb690d..000000000000 --- a/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VulkanAPI.h +++ /dev/null @@ -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(); diff --git a/games/vkquake/Makefile b/games/vkquake/Makefile index 523620c6cd63..9cfd6bbadf40 100644 --- a/games/vkquake/Makefile +++ b/games/vkquake/Makefile @@ -2,6 +2,7 @@ PORTNAME= vkquake DISTVERSION= 1.00.0 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= greg@unrelenting.technology diff --git a/graphics/gstreamer1-plugins-vulkan/Makefile b/graphics/gstreamer1-plugins-vulkan/Makefile index cba00529c08e..c7ecdf0c4ae3 100644 --- a/graphics/gstreamer1-plugins-vulkan/Makefile +++ b/graphics/gstreamer1-plugins-vulkan/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics COMMENT= GStreamer Vulkan graphics plugin diff --git a/graphics/libplacebo/Makefile b/graphics/libplacebo/Makefile index a281b5f0c361..3bba1204cb61 100644 --- a/graphics/libplacebo/Makefile +++ b/graphics/libplacebo/Makefile @@ -3,6 +3,7 @@ PORTNAME= libplacebo DISTVERSIONPREFIX= v DISTVERSION= 1.18.0 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/shaderc/Makefile b/graphics/shaderc/Makefile index 5d16a0da8323..225c29c074ae 100644 --- a/graphics/shaderc/Makefile +++ b/graphics/shaderc/Makefile @@ -3,6 +3,7 @@ PORTNAME= shaderc DISTVERSIONPREFIX=v DISTVERSION= 2018.0 +PORTREVISION= 1 CATEGORIES= graphics devel PATCH_SITES= https://github.com/haasn/${GH_PROJECT}/commit/ diff --git a/graphics/vkd3d/Makefile b/graphics/vkd3d/Makefile index 79552a4902db..c0d0de501b87 100644 --- a/graphics/vkd3d/Makefile +++ b/graphics/vkd3d/Makefile @@ -2,7 +2,7 @@ PORTNAME= vkd3d PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= https://dl.winehq.org/${PORTNAME}/source/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -28,7 +28,7 @@ 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: diff --git a/graphics/vkd3d/distinfo b/graphics/vkd3d/distinfo index 889e43d9fe02..7c2df85aa390 100644 --- a/graphics/vkd3d/distinfo +++ b/graphics/vkd3d/distinfo @@ -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 diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index c2580d10cf50..1cdae2e9c862 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -2,8 +2,7 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX=sdk- -DISTVERSION= 1.1.82.0 -PORTREVISION= 3 +DISTVERSION= 1.1.108.0 CATEGORIES= graphics devel MAINTAINER= greg@unrelenting.technology @@ -21,7 +20,7 @@ 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 diff --git a/graphics/vulkan-loader/distinfo b/graphics/vulkan-loader/distinfo index 3c169857e743..149f8e43ba5a 100644 --- a/graphics/vulkan-loader/distinfo +++ b/graphics/vulkan-loader/distinfo @@ -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 diff --git a/graphics/vulkan-loader/files/patch-CMakeLists.txt b/graphics/vulkan-loader/files/patch-CMakeLists.txt index ef328049a55c..b866989b58df 100644 --- a/graphics/vulkan-loader/files/patch-CMakeLists.txt +++ b/graphics/vulkan-loader/files/patch-CMakeLists.txt @@ -1,27 +1,15 @@ ---- 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) diff --git a/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt b/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt index 6dc7df83c230..c0064799a47f 100644 --- a/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt +++ b/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt @@ -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) diff --git a/graphics/vulkan-loader/pkg-plist b/graphics/vulkan-loader/pkg-plist index d52e84595793..026ab13dd665 100644 --- a/graphics/vulkan-loader/pkg-plist +++ b/graphics/vulkan-loader/pkg-plist @@ -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 diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index 667471866d0c..7ae3910e8817 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -4,7 +4,7 @@ PORTNAME= mpv PORTVERSION= 0.29.1 DISTVERSIONPREFIX= v -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= multimedia audio MASTER_SITES= https://waf.io/:waf |