diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index 3580c4160e6b..5b26d3d09229 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,18 +1,18 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.2.174 +DISTVERSION= 1.2.176 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org 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 diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo index 9f5681467220..de3e3a6200d9 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617005981 -SHA256 (KhronosGroup-Vulkan-Headers-v1.2.174_GH0.tar.gz) = 32a0a842081412eac756bf07a6f7ded421c78b2dcba3d4a8f6c410b532d0c739 -SIZE (KhronosGroup-Vulkan-Headers-v1.2.174_GH0.tar.gz) = 909126 +TIMESTAMP = 1618813914 +SHA256 (KhronosGroup-Vulkan-Headers-v1.2.176_GH0.tar.gz) = d77b033e74448341b42d1b6f2b380570e870b0443875f26c9e8a636f01ee6fe7 +SIZE (KhronosGroup-Vulkan-Headers-v1.2.176_GH0.tar.gz) = 1030697 diff --git a/graphics/vulkan-headers/files/patch-include_vulkan_vulkan.hpp b/graphics/vulkan-headers/files/patch-include_vulkan_vulkan.hpp index 8de486bd88ba..9915735db886 100644 --- a/graphics/vulkan-headers/files/patch-include_vulkan_vulkan.hpp +++ b/graphics/vulkan-headers/files/patch-include_vulkan_vulkan.hpp @@ -1,56 +1,56 @@ ---- include/vulkan/vulkan.hpp.orig 2021-03-01 06:51:42 UTC +--- include/vulkan/vulkan.hpp.orig 2021-04-19 06:31:54 UTC +++ include/vulkan/vulkan.hpp @@ -67,7 +67,7 @@ #endif #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1 --# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) +-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) # include # elif defined( _WIN32 ) typedef struct HINSTANCE__ * HINSTANCE; -@@ -92518,7 +92518,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -121385,7 +121385,7 @@ namespace VULKAN_HPP_NAMESPACE { if ( !vulkanLibraryName.empty() ) { --# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) +-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL ); # elif defined( _WIN32 ) m_library = ::LoadLibraryA( vulkanLibraryName.c_str() ); -@@ -92528,7 +92528,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -121395,7 +121395,7 @@ namespace VULKAN_HPP_NAMESPACE } else { --# if defined( __linux__ ) || defined( __QNXNTO__ ) -+# if defined( __unix__ ) || defined( __QNXNTO__ ) +-# if defined( __linux__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __unix__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL ); if ( m_library == nullptr ) { -@@ -92571,7 +92571,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -121439,7 +121439,7 @@ namespace VULKAN_HPP_NAMESPACE { if ( m_library ) { --# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) +-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) dlclose( m_library ); # elif defined( _WIN32 ) ::FreeLibrary( m_library ); -@@ -92584,7 +92584,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -121452,7 +121452,7 @@ namespace VULKAN_HPP_NAMESPACE template - T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT + T getProcAddress( const char * function ) const VULKAN_HPP_NOEXCEPT { --# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) +-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) return (T)dlsym( m_library, function ); # elif defined( _WIN32 ) - return (T)::GetProcAddress( m_library, function ); -@@ -92596,7 +92596,7 @@ namespace VULKAN_HPP_NAMESPACE - bool success() const VULKAN_HPP_NOEXCEPT { return m_library != nullptr; } + return ( T )::GetProcAddress( m_library, function ); +@@ -121467,7 +121467,7 @@ namespace VULKAN_HPP_NAMESPACE + } private: --# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) +-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) void * m_library; # elif defined( _WIN32 ) ::HINSTANCE m_library; diff --git a/graphics/vulkan-headers/pkg-plist b/graphics/vulkan-headers/pkg-plist index 417d3d2fd3ed..aa1d2c9d910e 100644 --- a/graphics/vulkan-headers/pkg-plist +++ b/graphics/vulkan-headers/pkg-plist @@ -1,31 +1,37 @@ +include/vk_video/vulkan_video_codec_h264std.h +include/vk_video/vulkan_video_codec_h264std_decode.h +include/vk_video/vulkan_video_codec_h264std_encode.h +include/vk_video/vulkan_video_codec_h265std.h +include/vk_video/vulkan_video_codec_h265std_decode.h +include/vk_video/vulkan_video_codecs_common.h 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_screen.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 diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 9efef6fe82d9..d057c160c6d6 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,41 +1,42 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v DISTVERSION= 1.2.174 +PORTREVISION= 1 CATEGORIES= graphics devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Driver loader for the Vulkan graphics API LICENSE= APACHE20 BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:${ARCH:Mi386:C/.+/gcc-/}c++11-lib pkgconfig python:3.4+,build USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Loader CMAKE_ON= CMAKE_SKIP_RPATH CMAKE_OFF= BUILD_TESTS OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT=WAYLAND XCB XLIB WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT XCB_DESC= ${X11_DESC} via libxcb XCB_USES= xorg XCB_USE= XORG=xcb XCB_CMAKE_BOOL= BUILD_WSI_XCB_SUPPORT XLIB_DESC= ${X11_DESC} via libX11 XLIB_USES= xorg XLIB_USE= XORG=x11,xrandr XLIB_CMAKE_BOOL= BUILD_WSI_XLIB_SUPPORT post-patch: # _XOPEN_SOURCE enforces X/Open-compliance but alloca isn't there @${REINPLACE_CMD} '/_XOPEN_SOURCE/d' ${WRKSRC}/loader/CMakeLists.txt .include diff --git a/graphics/vulkan-loader/files/patch-cmake_FindVulkanHeaders.cmake b/graphics/vulkan-loader/files/patch-cmake_FindVulkanHeaders.cmake new file mode 100644 index 000000000000..ad836da3157d --- /dev/null +++ b/graphics/vulkan-loader/files/patch-cmake_FindVulkanHeaders.cmake @@ -0,0 +1,39 @@ +Part of https://github.com/KhronosGroup/Vulkan-Loader/commit/eb6d6f95dff8 + +$ make check-plist +====> Checking for pkg-plist issues (check-plist) +===> Parsing plist +===> Checking for items in STAGEDIR missing from pkg-plist +Error: Orphaned: lib/libvulkan.so.0.0.176 +===> Checking for items in pkg-plist which are not in STAGEDIR +Error: Missing: lib/libvulkan.so.1.2.176 +===> Error: Plist issues found. +*** Error code 1 + +--- cmake/FindVulkanHeaders.cmake.orig 2021-03-29 20:05:47 UTC ++++ cmake/FindVulkanHeaders.cmake +@@ -114,19 +114,19 @@ endif() + file(STRINGS + ${VulkanHeaders_main_header} + VulkanHeaders_lines +- REGEX "^#define (VK_API_VERSION.*VK_MAKE_VERSION|VK_HEADER_VERSION)") ++ REGEX "^#define VK_HEADER_VERSION(_COMPLETE)? ") + + foreach(VulkanHeaders_line ${VulkanHeaders_lines}) + + # First, handle the case where we have a major/minor version + # Format is: +- # #define VK_API_VERSION_X_Y VK_MAKE_VERSION(X, Y, 0) ++ # #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, X, Y, VK_HEADER_VERSION) + # We grab the major version (X) and minor version (Y) out of the parentheses +- string(REGEX MATCH "VK_MAKE_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line}) ++ string(REGEX MATCH "VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line}) + string(REGEX MATCHALL "[0-9]+" VulkanHeaders_MAJOR_MINOR "${VulkanHeaders_out}") + if (VulkanHeaders_MAJOR_MINOR) +- list (GET VulkanHeaders_MAJOR_MINOR 0 VulkanHeaders_cur_major) +- list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_minor) ++ list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_major) ++ list (GET VulkanHeaders_MAJOR_MINOR 2 VulkanHeaders_cur_minor) + if (${VulkanHeaders_cur_major} GREATER ${VulkanHeaders_VERSION_MAJOR}) + set(VulkanHeaders_VERSION_MAJOR ${VulkanHeaders_cur_major}) + set(VulkanHeaders_VERSION_MINOR ${VulkanHeaders_cur_minor}) diff --git a/graphics/vulkan-loader/pkg-plist b/graphics/vulkan-loader/pkg-plist index 10ff833e30b9..2995ab120214 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.2.174 +lib/libvulkan.so.1.2.176 libdata/pkgconfig/vulkan.pc