From ecc9ea5194c5e59d2616e14132feddc190af858a Mon Sep 17 00:00:00 2001 From: jbeich Date: Fri, 15 May 2020 03:26:04 +0000 Subject: [PATCH] devel/vulkan-*: update to 1.2.154 Changes: https://github.com/KhronosGroup/Vulkan-Headers/compare/sdk-1.2.135.0...sdk-1.2.154.0 Changes: https://github.com/KhronosGroup/Vulkan-Loader/compare/sdk-1.2.135.0...sdk-1.2.154.1 Changes: https://github.com/KhronosGroup/Vulkan-Tools/compare/sdk-1.2.135.0...sdk-1.2.154.0 PR: 251345 Approved by: Greg V (maintainer) --- devel/vulkan-headers/Makefile | 2 +- devel/vulkan-headers/distinfo | 6 +- .../files/patch-include_vulkan_vulkan.hpp | 71 +++++++++++-------- devel/vulkan-headers/pkg-plist | 1 + devel/vulkan-tools/Makefile | 5 +- devel/vulkan-tools/distinfo | 10 +-- devel/vulkan-tools/pkg-plist | 1 + graphics/vulkan-loader/Makefile | 9 +-- graphics/vulkan-loader/distinfo | 8 +-- .../files/patch-loader_vk__loader__platform.h | 29 +++++++- graphics/vulkan-loader/pkg-plist | 2 +- 11 files changed, 90 insertions(+), 54 deletions(-) diff --git a/devel/vulkan-headers/Makefile b/devel/vulkan-headers/Makefile index 48b7bc8118a6..9da01afe1f48 100644 --- a/devel/vulkan-headers/Makefile +++ b/devel/vulkan-headers/Makefile @@ -2,7 +2,7 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX=sdk- -DISTVERSION= 1.2.135.0 +DISTVERSION= 1.2.154.0 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology diff --git a/devel/vulkan-headers/distinfo b/devel/vulkan-headers/distinfo index f6ef42854ff3..c362cd3dbbf5 100644 --- a/devel/vulkan-headers/distinfo +++ b/devel/vulkan-headers/distinfo @@ -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 diff --git a/devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp b/devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp index 42ebcc526726..f84a301953b2 100644 --- a/devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp +++ b/devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp @@ -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; diff --git a/devel/vulkan-headers/pkg-plist b/devel/vulkan-headers/pkg-plist index 53f0dbe38b9d..b2af760b236c 100644 --- a/devel/vulkan-headers/pkg-plist +++ b/devel/vulkan-headers/pkg-plist @@ -7,6 +7,7 @@ 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 diff --git a/devel/vulkan-tools/Makefile b/devel/vulkan-tools/Makefile index 623868393542..3f569ecd80e5 100644 --- a/devel/vulkan-tools/Makefile +++ b/devel/vulkan-tools/Makefile @@ -2,8 +2,7 @@ PORTNAME= vulkan-tools DISTVERSIONPREFIX= sdk- -DISTVERSION= 1.2.135.0 -PORTREVISION= 3 +DISTVERSION= 1.2.154.0 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology @@ -34,7 +33,7 @@ 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 diff --git a/devel/vulkan-tools/distinfo b/devel/vulkan-tools/distinfo index d9aa220c14ec..28af1d23f215 100644 --- a/devel/vulkan-tools/distinfo +++ b/devel/vulkan-tools/distinfo @@ -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 diff --git a/devel/vulkan-tools/pkg-plist b/devel/vulkan-tools/pkg-plist index 574522f8e908..f18aa4b6c456 100644 --- a/devel/vulkan-tools/pkg-plist +++ b/devel/vulkan-tools/pkg-plist @@ -2,6 +2,7 @@ %%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 diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 55230efda36f..bcbc71eb0875 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -2,12 +2,9 @@ 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 @@ -41,4 +38,8 @@ XCB_LIB_DEPENDS= libX11-xcb.so:x11/libX11 \ 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 diff --git a/graphics/vulkan-loader/distinfo b/graphics/vulkan-loader/distinfo index c07105323ccc..cdffa4bc1b06 100644 --- a/graphics/vulkan-loader/distinfo +++ b/graphics/vulkan-loader/distinfo @@ -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 diff --git a/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h b/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h index 153cf8ecc747..de0c62f65c45 100644 --- a/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h +++ b/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h @@ -1,4 +1,4 @@ ---- 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" @@ -9,3 +9,30 @@ /* 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__) diff --git a/graphics/vulkan-loader/pkg-plist b/graphics/vulkan-loader/pkg-plist index 65703fbba40f..fb9eb69a9aeb 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.135 +lib/libvulkan.so.1.2.154 libdata/pkgconfig/vulkan.pc