diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index df8969082ef0..00040545e200 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,18 +1,18 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.2.179 +DISTVERSION= 1.2.180 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 03a7496551bf..1c5f7f45a85c 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1621843001 -SHA256 (KhronosGroup-Vulkan-Headers-v1.2.179_GH0.tar.gz) = b659719ae08379be36022d545247cba50036827fdeec5ae1b30889d50f358459 -SIZE (KhronosGroup-Vulkan-Headers-v1.2.179_GH0.tar.gz) = 1048047 +TIMESTAMP = 1623046245 +SHA256 (KhronosGroup-Vulkan-Headers-v1.2.180_GH0.tar.gz) = ed4974bd223e3868db3be66c2f1fe0eb85de6ecc897a9a7da2e263a98abdd214 +SIZE (KhronosGroup-Vulkan-Headers-v1.2.180_GH0.tar.gz) = 1065448 diff --git a/graphics/vulkan-headers/files/patch-include_vulkan_vulkan.hpp b/graphics/vulkan-headers/files/patch-include_vulkan_vulkan.hpp deleted file mode 100644 index 9915735db886..000000000000 --- a/graphics/vulkan-headers/files/patch-include_vulkan_vulkan.hpp +++ /dev/null @@ -1,56 +0,0 @@ ---- 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__ ) || defined( __Fuchsia__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) - # include - # elif defined( _WIN32 ) - typedef struct HINSTANCE__ * HINSTANCE; -@@ -121385,7 +121385,7 @@ namespace VULKAN_HPP_NAMESPACE - { - if ( !vulkanLibraryName.empty() ) - { --# 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() ); -@@ -121395,7 +121395,7 @@ namespace VULKAN_HPP_NAMESPACE - } - else - { --# 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 ) - { -@@ -121439,7 +121439,7 @@ namespace VULKAN_HPP_NAMESPACE - { - if ( m_library ) - { --# 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 ); -@@ -121452,7 +121452,7 @@ namespace VULKAN_HPP_NAMESPACE - template - T getProcAddress( const char * function ) const VULKAN_HPP_NOEXCEPT - { --# 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 ); -@@ -121467,7 +121467,7 @@ namespace VULKAN_HPP_NAMESPACE - } - - private: --# 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-loader/Makefile b/graphics/vulkan-loader/Makefile index daa6a8e2947d..169f5a8cffeb 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,41 +1,42 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v DISTVERSION= 1.2.179 +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/pkg-plist b/graphics/vulkan-loader/pkg-plist index 49e90e689abb..552ced8b46c6 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.179 +lib/libvulkan.so.1.2.180 libdata/pkgconfig/vulkan.pc