Attachment #219926 for bug #251345

Lines 2-8 Link Here

(-)b/devel/vulkan-headers/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= vulkan-headers	3	PORTNAME= vulkan-headers
4	DISTVERSIONPREFIX=sdk-	4	DISTVERSIONPREFIX=sdk-
5	DISTVERSION= 1.2.135.0	5	DISTVERSION= 1.2.154.0
6	CATEGORIES= devel graphics	6	CATEGORIES= devel graphics
7		7
8	MAINTAINER= greg@unrelenting.technology	8	MAINTAINER= greg@unrelenting.technology

Lines 1-3 Link Here

(-)b/devel/vulkan-headers/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1589407360	1	TIMESTAMP = 1600680367
2	SHA256 (KhronosGroup-Vulkan-Headers-sdk-1.2.135.0_GH0.tar.gz) = befc69991e1e268db75921c577be32a3f315d01d78b39b74ef87ba6908787b63	2	SHA256 (KhronosGroup-Vulkan-Headers-sdk-1.2.154.0_GH0.tar.gz) = a0528ade4dd3bd826b960ba4ccabc62e92ecedc3c70331b291e0a7671b3520f9
3	SIZE (KhronosGroup-Vulkan-Headers-sdk-1.2.135.0_GH0.tar.gz) = 757133	3	SIZE (KhronosGroup-Vulkan-Headers-sdk-1.2.154.0_GH0.tar.gz) = 817107




--- include/vulkan/vulkan.hpp.orig	2020-09-21 09:26:07 UTC
+++ include/vulkan/vulkan.hpp
@@ -66,7 +66,7 @@
 #endif
 
 #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
-#  if defined( __linux__ ) || defined( __APPLE__ )
+#  if defined( __unix__ ) || defined( __APPLE__ )
 #    include <dlfcn.h>
 #  elif defined( _WIN32 )
 typedef struct HINSTANCE__ * HINSTANCE;
@@ -90062,7 +90062,7 @@ namespace VULKAN_HPP_NAMESPACE
     DynamicLoader() : m_success( false )
 #endif
     {
       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__ ) || defined( __APPLE__ )
         dlclose( m_library );
 #  elif defined( _WIN32 )
         ::FreeLibrary( m_library );
@@ -90132,7 +90132,7 @@ namespace VULKAN_HPP_NAMESPACE
     template <typename T>
     T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT
     {
-#  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 );
@@ -90145,7 +90145,7 @@ namespace VULKAN_HPP_NAMESPACE
 
   private:
     bool m_success;
-#  if defined( __linux__ ) || defined( __APPLE__ )
+#  if defined( __unix__ ) || defined( __APPLE__ )
     void * m_library;
 #  elif defined( _WIN32 )
     ::HINSTANCE m_library;

Lines 7-12 include/vulkan/vulkan.hpp Link Here

(-)b/devel/vulkan-headers/pkg-plist (+1 lines)
7	include/vulkan/vulkan_android.h	7	include/vulkan/vulkan_android.h
8	include/vulkan/vulkan_beta.h	8	include/vulkan/vulkan_beta.h
9	include/vulkan/vulkan_core.h	9	include/vulkan/vulkan_core.h
		10	include/vulkan/vulkan_directfb.h
10	include/vulkan/vulkan_fuchsia.h	11	include/vulkan/vulkan_fuchsia.h
11	include/vulkan/vulkan_ggp.h	12	include/vulkan/vulkan_ggp.h
12	include/vulkan/vulkan_ios.h	13	include/vulkan/vulkan_ios.h

Lines 2-9 Link Here

(-)b/devel/vulkan-tools/Makefile (-3 / +2 lines)
2		2
3	PORTNAME= vulkan-tools	3	PORTNAME= vulkan-tools
4	DISTVERSIONPREFIX= sdk-	4	DISTVERSIONPREFIX= sdk-
5	DISTVERSION= 1.2.135.0	5	DISTVERSION= 1.2.154.0
6	PORTREVISION= 3
7	CATEGORIES= devel graphics	6	CATEGORIES= devel graphics
8		7
9	MAINTAINER= greg@unrelenting.technology	8	MAINTAINER= greg@unrelenting.technology
Lines 34-40 XCB_DESC= Build XCB WSI (Window System Integration) support Link Here
34	XLIB_DESC= Build Xlib WSI (Window System Integration) support	33	XLIB_DESC= Build Xlib WSI (Window System Integration) support
35		34
36	WAYLAND_PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/	35	WAYLAND_PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
37	WAYLAND_PATCHFILES= 6f6e3371c92a.patch:-p1	36	WAYLAND_PATCHFILES= ea2e75bea224.patch:-p1
38	WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \	37	WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
39	wayland-protocols>0:graphics/wayland-protocols	38	wayland-protocols>0:graphics/wayland-protocols
40	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland	39	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland

Lines 1-5 Link Here

(-)b/devel/vulkan-tools/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1589481709	1	TIMESTAMP = 1601595292
2	SHA256 (KhronosGroup-Vulkan-Tools-sdk-1.2.135.0_GH0.tar.gz) = 83add7b6390ab1eb9b71106b50d7f5ae6afb74374762f0028afc9fdef5380c83	2	SHA256 (KhronosGroup-Vulkan-Tools-sdk-1.2.154.0_GH0.tar.gz) = c7d66ec1f5fe5c0a13e487fe5c6eefd3a954522c0b05f06bd2ae41792aeea272
3	SIZE (KhronosGroup-Vulkan-Tools-sdk-1.2.135.0_GH0.tar.gz) = 710085	3	SIZE (KhronosGroup-Vulkan-Tools-sdk-1.2.154.0_GH0.tar.gz) = 720085
4	SHA256 (6f6e3371c92a.patch) = 98ee52a6378ece93e0f2ae738677c25e2874b3615a9a1e194814ba8321dd37fb	4	SHA256 (ea2e75bea224.patch) = 1a2550804a1bd7e66f5d19043dc540ffadc55a1bfe6b8734c353c0bd3a1090d1
5	SIZE (6f6e3371c92a.patch) = 22365	5	SIZE (ea2e75bea224.patch) = 22460

Lines 2-7 Link Here

(-)b/devel/vulkan-tools/pkg-plist (+1 lines)
2	%%WAYLAND%%bin/vkcube-wayland	2	%%WAYLAND%%bin/vkcube-wayland
3	%%XCB%%bin/vkcube-xcb	3	%%XCB%%bin/vkcube-xcb
4	%%XLIB%%bin/vkcube-xlib	4	%%XLIB%%bin/vkcube-xlib
		5	%%DISPLAY%%bin/vkcubepp-display
5	%%WAYLAND%%bin/vkcubepp-wayland	6	%%WAYLAND%%bin/vkcubepp-wayland
6	%%XCB%%bin/vkcubepp-xcb	7	%%XCB%%bin/vkcubepp-xcb
7	%%XLIB%%bin/vkcubepp-xlib	8	%%XLIB%%bin/vkcubepp-xlib

Lines 2-13 Link Here

(-)b/graphics/vulkan-loader/Makefile (-4 / +5 lines)
2		2
3	PORTNAME= vulkan-loader	3	PORTNAME= vulkan-loader
4	DISTVERSIONPREFIX=sdk-	4	DISTVERSIONPREFIX=sdk-
5	DISTVERSION= 1.2.135.0	5	DISTVERSION= 1.2.154.1
6	CATEGORIES= graphics devel	6	CATEGORIES= graphics devel
7		7
8	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
9	PATCHFILES+= 8d2d49a9c89d.patch:-p1 # https://github.com/KhronosGroup/Vulkan-Loader/pull/419
10
11	MAINTAINER= greg@unrelenting.technology	8	MAINTAINER= greg@unrelenting.technology
12	COMMENT= Driver loader for the Vulkan graphics API	9	COMMENT= Driver loader for the Vulkan graphics API
13		10
Lines 41-44 XCB_LIB_DEPENDS= libX11-xcb.so:x11/libX11 \ Link Here
41	WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT	38	WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT
42	WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland	39	WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland
43		40
		41	post-patch:
		42	# _XOPEN_SOURCE enforces X/Open-compliance but alloca isn't there
		43	@${REINPLACE_CMD} '/_XOPEN_SOURCE/d' ${WRKSRC}/loader/CMakeLists.txt
		44
44	.include <bsd.port.mk>	45	.include <bsd.port.mk>

Lines 1-5 Link Here

(-)b/graphics/vulkan-loader/distinfo (-5 / +3 lines)
1	TIMESTAMP = 1589407291	1	TIMESTAMP = 1602103147
2	SHA256 (KhronosGroup-Vulkan-Loader-sdk-1.2.135.0_GH0.tar.gz) = 98cd19e4603ca6acc5427686516d0abbf5026acf519d9e40f8136acf809cd117	2	SHA256 (KhronosGroup-Vulkan-Loader-sdk-1.2.154.1_GH0.tar.gz) = 889e45f7175d915dd0d702013b8021192e181d20f2ad4021c94006088f1edfe5
3	SIZE (KhronosGroup-Vulkan-Loader-sdk-1.2.135.0_GH0.tar.gz) = 1406699	3	SIZE (KhronosGroup-Vulkan-Loader-sdk-1.2.154.1_GH0.tar.gz) = 1417527
4	SHA256 (8d2d49a9c89d.patch) = 8c5a755821d340303155cae985e1a9cea4cb6f4e9aab10de9e7297e505d4d6d3
5	SIZE (8d2d49a9c89d.patch) = 1064




--- 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"

 /* 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 <sys/sysctl.h>
+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__)

Lines 1-4 Link Here

(-)b/graphics/vulkan-loader/pkg-plist (-1 / +1 lines)
1	lib/libvulkan.so	1	lib/libvulkan.so
2	lib/libvulkan.so.1	2	lib/libvulkan.so.1
3	lib/libvulkan.so.1.2.135	3	lib/libvulkan.so.1.2.154
4	libdata/pkgconfig/vulkan.pc	4	libdata/pkgconfig/vulkan.pc

Return to bug 251345

Lines 1-47 Link Here

(-)b/devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp (-31 / +40 lines)
1	--- include/vulkan/vulkan.hpp.orig 2020-05-14 18:48:51 UTC	1	--- include/vulkan/vulkan.hpp.orig 2020-09-21 09:26:07 UTC
2	+++ include/vulkan/vulkan.hpp	2	+++ include/vulkan/vulkan.hpp
3	@@ -65,7 +65,7 @@	3	@@ -66,7 +66,7 @@
4	#endif	4	#endif
5		5
6	#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1	6	#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
7	-# if defined(__linux__) \|\| defined(__APPLE__)	7	-# if defined( __linux__ ) \|\| defined( __APPLE__ )
8	+# if defined(__unix__)	8	+# if defined( __unix__ ) \|\| defined( __APPLE__ )
9	# include <dlfcn.h>	9	# include <dlfcn.h>
10	# endif	10	# elif defined( _WIN32 )
11		11	typedef struct HINSTANCE__ * HINSTANCE;
12	@@ -81153,7 +81153,7 @@ namespace VULKAN_HPP_NAMESPACE	12	@@ -90062,7 +90062,7 @@ namespace VULKAN_HPP_NAMESPACE
13	DynamicLoader() : m_success( false )
14	#endif
15	{	13	{
16	-#if defined(__linux__)	14	if ( !vulkanLibraryName.empty() )
17	+#if defined(__unix__)	15	{
18	m_library = dlopen( "libvulkan.so", RTLD_NOW \| RTLD_LOCAL );	16	-# if defined( __linux__ ) \|\| defined( __APPLE__ )
19	#elif defined(__APPLE__)	17	+# if defined( __unix__ ) \|\| defined( __APPLE__ )
20	m_library = dlopen( "libvulkan.dylib", RTLD_NOW \| RTLD_LOCAL );	18	m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW \| RTLD_LOCAL );
21	@@ -81195,7 +81195,7 @@ namespace VULKAN_HPP_NAMESPACE	19	# elif defined( _WIN32 )
		20	m_library = ::LoadLibraryA( vulkanLibraryName.c_str() );
		21	@@ -90072,7 +90072,7 @@ namespace VULKAN_HPP_NAMESPACE
		22	}
		23	else
		24	{
		25	-# if defined( __linux__ )
		26	+# if defined( __unix__ )
		27	m_library = dlopen( "libvulkan.so", RTLD_NOW \| RTLD_LOCAL );
		28	if ( m_library == nullptr )
		29	{
		30	@@ -90119,7 +90119,7 @@ namespace VULKAN_HPP_NAMESPACE
22	{	31	{
23	if ( m_library )	32	if ( m_library )
24	{	33	{
25	-#if defined(__linux__) \|\| defined(__APPLE__)	34	-# if defined( __linux__ ) \|\| defined( __APPLE__ )
26	+#if defined(__unix__)	35	+# if defined( __unix__ ) \|\| defined( __APPLE__ )
27	dlclose( m_library );	36	dlclose( m_library );
28	#elif defined(_WIN32)	37	# elif defined( _WIN32 )
29	FreeLibrary( m_library );	38	::FreeLibrary( m_library );
30	@@ -81206,7 +81206,7 @@ namespace VULKAN_HPP_NAMESPACE	39	@@ -90132,7 +90132,7 @@ namespace VULKAN_HPP_NAMESPACE
31	template <typename T>	40	template <typename T>
32	T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT	41	T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT
33	{	42	{
34	-#if defined(__linux__) \|\| defined(__APPLE__)	43	-# if defined( __linux__ ) \|\| defined( __APPLE__ )
35	+#if defined(__unix__)	44	+# if defined( __unix__ ) \|\| defined( __APPLE__ )
36	return (T)dlsym( m_library, function );	45	return (T)dlsym( m_library, function );
37	#elif defined(_WIN32)	46	# elif defined( _WIN32 )
38	return (T)GetProcAddress( m_library, function );	47	return (T)::GetProcAddress( m_library, function );
39	@@ -81217,7 +81217,7 @@ namespace VULKAN_HPP_NAMESPACE	48	@@ -90145,7 +90145,7 @@ namespace VULKAN_HPP_NAMESPACE
40		49
41	private:	50	private:
42	bool m_success;	51	bool m_success;
43	-#if defined(__linux__) \|\| defined(__APPLE__)	52	-# if defined( __linux__ ) \|\| defined( __APPLE__ )
44	+#if defined(__unix__)	53	+# if defined( __unix__ ) \|\| defined( __APPLE__ )
45	void *m_library;	54	void * m_library;
46	#elif defined(_WIN32)	55	# elif defined( _WIN32 )
47	HMODULE m_library;	56	::HINSTANCE m_library;

Lines 1-4 Link Here

(-)b/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h (-1 / +28 lines)
1	--- loader/vk_loader_platform.h.orig 2020-04-02 16:20:56 UTC	1	--- loader/vk_loader_platform.h.orig 2020-10-07 20:39:07 UTC
2	+++ loader/vk_loader_platform.h	2	+++ loader/vk_loader_platform.h
3	@@ -31,7 +31,7 @@	3	@@ -31,7 +31,7 @@
4	#include "vulkan/vk_platform.h"	4	#include "vulkan/vk_platform.h"
Lines 9-11 Link Here
9	/* Linux-specific common code: */	9	/* Linux-specific common code: */
10		10
11	// Headers:	11	// Headers:
		12	@@ -116,6 +116,26 @@ static inline char *loader_platform_executable_path(ch
		13	int ret = proc_pidpath(pid, buffer, size);
		14	if (ret <= 0) return NULL;
		15	buffer[ret] = '\0';
		16	+ return buffer;
		17	+}
		18	+#elif defined(__DragonFly__) \|\| defined(__FreeBSD__) \|\| defined(__NetBSD__)
		19	+#include <sys/sysctl.h>
		20	+static inline char loader_platform_executable_path(char buffer, size_t size) {
		21	+ int mib[] = {
		22	+ CTL_KERN,
		23	+#if defined(__NetBSD__)
		24	+ KERN_PROC_ARGS,
		25	+ -1,
		26	+ KERN_PROC_PATHNAME,
		27	+#else
		28	+ KERN_PROC,
		29	+ KERN_PROC_PATHNAME,
		30	+ -1,
		31	+#endif
		32	+ };
		33	+ if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buffer, &size, NULL, 0) < 0)
		34	+ return NULL;
		35	+
		36	return buffer;
		37	}
		38	#endif // defined (__APPLE__)