View | Details | Raw Unified | Return to bug 251698
Collapse All | Expand All

(-)b/devel/spirv-tools/Makefile (-2 / +2 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	spirv-tools
3
PORTNAME=	spirv-tools
4
DISTVERSIONPREFIX=	v
4
DISTVERSIONPREFIX=	v
5
DISTVERSION=	2020.4
5
DISTVERSION=	2020.6
6
CATEGORIES=	devel graphics
6
CATEGORIES=	devel graphics
7
7
8
MAINTAINER=	greg@unrelenting.technology
8
MAINTAINER=	greg@unrelenting.technology
Lines 17-23 SHEBANG_FILES= tools/lesspipe/spirv-lesspipe.sh Link Here
17
USE_GITHUB=	yes
17
USE_GITHUB=	yes
18
GH_ACCOUNT=	KhronosGroup
18
GH_ACCOUNT=	KhronosGroup
19
GH_PROJECT=	SPIRV-Tools
19
GH_PROJECT=	SPIRV-Tools
20
GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.3.reservations1:headers/external/spirv-headers
20
GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed:headers/external/spirv-headers
21
21
22
CMAKE_ON=	SPIRV_SKIP_TESTS
22
CMAKE_ON=	SPIRV_SKIP_TESTS
23
CMAKE_OFF=	SPIRV_WERROR
23
CMAKE_OFF=	SPIRV_WERROR
(-)b/devel/spirv-tools/distinfo (-5 / +5 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1606327101
1
TIMESTAMP = 1607357641
2
SHA256 (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = d6377d2febe831eb78e84593a10d242a4fd52cb12174133151cb48801abdc6d2
2
SHA256 (KhronosGroup-SPIRV-Tools-v2020.6_GH0.tar.gz) = de2392682df8def7ac666a2a320cd475751badf4790b01c7391b7644ecb550a3
3
SIZE (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = 2282982
3
SIZE (KhronosGroup-SPIRV-Tools-v2020.6_GH0.tar.gz) = 2595300
4
SHA256 (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = aa3c579cd250b23aae735c7c55c3514df4ffc5f98963d95a952bcc89336768bd
4
SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed_GH0.tar.gz) = df2ad2520be4d95a479fa248921065885bbf435a658349a7fc164ad7b26b68c6
5
SIZE (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = 393836
5
SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed_GH0.tar.gz) = 395500
(-)b/devel/vulkan-headers/Makefile (-2 / +2 lines)
Lines 1-8 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	vulkan-headers
3
PORTNAME=	vulkan-headers
4
DISTVERSIONPREFIX=sdk-
4
DISTVERSIONPREFIX=v
5
DISTVERSION=	1.2.154.0
5
DISTVERSION=	1.2.162
6
CATEGORIES=	devel graphics
6
CATEGORIES=	devel graphics
7
7
8
MAINTAINER=	greg@unrelenting.technology
8
MAINTAINER=	greg@unrelenting.technology
(-)b/devel/vulkan-headers/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1600680367
1
TIMESTAMP = 1606147399
2
SHA256 (KhronosGroup-Vulkan-Headers-sdk-1.2.154.0_GH0.tar.gz) = a0528ade4dd3bd826b960ba4ccabc62e92ecedc3c70331b291e0a7671b3520f9
2
SHA256 (KhronosGroup-Vulkan-Headers-v1.2.162_GH0.tar.gz) = deab1a7a28ad3e0a7a0a1c4cd9c54758dce115a5f231b7205432d2bbbfb4d456
3
SIZE (KhronosGroup-Vulkan-Headers-sdk-1.2.154.0_GH0.tar.gz) = 817107
3
SIZE (KhronosGroup-Vulkan-Headers-v1.2.162_GH0.tar.gz) = 852973
(-)b/devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp (-8 / +8 lines)
Lines 1-6 Link Here
1
--- include/vulkan/vulkan.hpp.orig	2020-09-21 09:26:07 UTC
1
--- include/vulkan/vulkan.hpp.orig	2020-12-07 12:15:47 UTC
2
+++ include/vulkan/vulkan.hpp
2
+++ include/vulkan/vulkan.hpp
3
@@ -66,7 +66,7 @@
3
@@ -67,7 +67,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
Lines 9-15 Link Here
9
 #    include <dlfcn.h>
9
 #    include <dlfcn.h>
10
 #  elif defined( _WIN32 )
10
 #  elif defined( _WIN32 )
11
 typedef struct HINSTANCE__ * HINSTANCE;
11
 typedef struct HINSTANCE__ * HINSTANCE;
12
@@ -90062,7 +90062,7 @@ namespace VULKAN_HPP_NAMESPACE
12
@@ -92754,7 +92754,7 @@ namespace VULKAN_HPP_NAMESPACE
13
     {
13
     {
14
       if ( !vulkanLibraryName.empty() )
14
       if ( !vulkanLibraryName.empty() )
15
       {
15
       {
Lines 18-24 Link Here
18
         m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL );
18
         m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL );
19
 #  elif defined( _WIN32 )
19
 #  elif defined( _WIN32 )
20
         m_library = ::LoadLibraryA( vulkanLibraryName.c_str() );
20
         m_library = ::LoadLibraryA( vulkanLibraryName.c_str() );
21
@@ -90072,7 +90072,7 @@ namespace VULKAN_HPP_NAMESPACE
21
@@ -92764,7 +92764,7 @@ namespace VULKAN_HPP_NAMESPACE
22
       }
22
       }
23
       else
23
       else
24
       {
24
       {
Lines 27-33 Link Here
27
         m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL );
27
         m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL );
28
         if ( m_library == nullptr )
28
         if ( m_library == nullptr )
29
         {
29
         {
30
@@ -90119,7 +90119,7 @@ namespace VULKAN_HPP_NAMESPACE
30
@@ -92807,7 +92807,7 @@ namespace VULKAN_HPP_NAMESPACE
31
     {
31
     {
32
       if ( m_library )
32
       if ( m_library )
33
       {
33
       {
Lines 36-42 Link Here
36
         dlclose( m_library );
36
         dlclose( m_library );
37
 #  elif defined( _WIN32 )
37
 #  elif defined( _WIN32 )
38
         ::FreeLibrary( m_library );
38
         ::FreeLibrary( m_library );
39
@@ -90132,7 +90132,7 @@ namespace VULKAN_HPP_NAMESPACE
39
@@ -92820,7 +92820,7 @@ namespace VULKAN_HPP_NAMESPACE
40
     template <typename T>
40
     template <typename T>
41
     T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT
41
     T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT
42
     {
42
     {
Lines 45-54 Link Here
45
       return (T)dlsym( m_library, function );
45
       return (T)dlsym( m_library, function );
46
 #  elif defined( _WIN32 )
46
 #  elif defined( _WIN32 )
47
       return (T)::GetProcAddress( m_library, function );
47
       return (T)::GetProcAddress( m_library, function );
48
@@ -90145,7 +90145,7 @@ namespace VULKAN_HPP_NAMESPACE
48
@@ -92832,7 +92832,7 @@ namespace VULKAN_HPP_NAMESPACE
49
     bool success() const VULKAN_HPP_NOEXCEPT { return m_library != nullptr; }
49
 
50
 
50
   private:
51
   private:
51
     bool m_success;
52
-#  if defined( __linux__ ) || defined( __APPLE__ )
52
-#  if defined( __linux__ ) || defined( __APPLE__ )
53
+#  if defined( __unix__ ) || defined( __APPLE__ )
53
+#  if defined( __unix__ ) || defined( __APPLE__ )
54
     void * m_library;
54
     void * m_library;
(-)b/devel/vulkan-tools/Makefile (-2 / +2 lines)
Lines 1-8 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	vulkan-tools
3
PORTNAME=	vulkan-tools
4
DISTVERSIONPREFIX=	sdk-
4
DISTVERSIONPREFIX=	v
5
DISTVERSION=	1.2.154.0
5
DISTVERSION=	1.2.162
6
CATEGORIES=	devel graphics
6
CATEGORIES=	devel graphics
7
7
8
MAINTAINER=	greg@unrelenting.technology
8
MAINTAINER=	greg@unrelenting.technology
(-)b/devel/vulkan-tools/distinfo (-3 / +3 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1601595292
1
TIMESTAMP = 1606258133
2
SHA256 (KhronosGroup-Vulkan-Tools-sdk-1.2.154.0_GH0.tar.gz) = c7d66ec1f5fe5c0a13e487fe5c6eefd3a954522c0b05f06bd2ae41792aeea272
2
SHA256 (KhronosGroup-Vulkan-Tools-v1.2.162_GH0.tar.gz) = 98a3a00471da65df833b4ffeb1ab29ec1d169d5feab54270cf4cd8f50f82e682
3
SIZE (KhronosGroup-Vulkan-Tools-sdk-1.2.154.0_GH0.tar.gz) = 720085
3
SIZE (KhronosGroup-Vulkan-Tools-v1.2.162_GH0.tar.gz) = 724232
4
SHA256 (ea2e75bea224.patch) = 1a2550804a1bd7e66f5d19043dc540ffadc55a1bfe6b8734c353c0bd3a1090d1
4
SHA256 (ea2e75bea224.patch) = 1a2550804a1bd7e66f5d19043dc540ffadc55a1bfe6b8734c353c0bd3a1090d1
5
SIZE (ea2e75bea224.patch) = 22460
5
SIZE (ea2e75bea224.patch) = 22460
(-)b/devel/vulkan-validation-layers/Makefile (-14 / +6 lines)
Lines 1-8 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	vulkan-validation-layers
3
PORTNAME=	vulkan-validation-layers
4
DISTVERSIONPREFIX=	sdk-
4
DISTVERSIONPREFIX=	v
5
DISTVERSION=	1.2.154.0
5
DISTVERSION=	1.2.162
6
CATEGORIES=	devel graphics
6
CATEGORIES=	devel graphics
7
7
8
MAINTAINER=	greg@unrelenting.technology
8
MAINTAINER=	greg@unrelenting.technology
Lines 21-40 USE_LDCONFIG= yes Link Here
21
USE_GITHUB=	yes
21
USE_GITHUB=	yes
22
GH_ACCOUNT=	KhronosGroup
22
GH_ACCOUNT=	KhronosGroup
23
GH_PROJECT=	Vulkan-ValidationLayers
23
GH_PROJECT=	Vulkan-ValidationLayers
24
GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.3.reservations1:headers/external/spirv-headers
24
GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed:headers/external/spirv-headers
25
25
26
# WSI_* in here are leftover from when all of Vulkan SDK was in one repo
26
# WSI_* in here are leftover from when all of Vulkan SDK was in one repo
27
CMAKE_OFF=	BUILD_TESTS BUILD_WSI_XCB_SUPPORT BUILD_WSI_XLIB_SUPPORT \
27
CMAKE_OFF=	BUILD_TESTS ${WAYLAND XCB XLIB:L:C/.*/BUILD_WSI_&_SUPPORT/}
28
		BUILD_WSI_WAYLAND_SUPPORT
29
CMAKE_ON=	BUILD_LAYER_SUPPORT_FILES
28
CMAKE_ON=	BUILD_LAYER_SUPPORT_FILES
30
CMAKE_ARGS=	-DGLSLANG_INSTALL_DIR=${LOCALBASE} \
29
CMAKE_ARGS=	-DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}" \
31
		-DCMAKE_INSTALL_INCLUDEDIR=${LOCALBASE}/include \
30
		-DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}"
32
		-DSPIRV_HEADERS_INSTALL_DIR=${WRKSRC_headers} \
33
		-DSPIRV_TOOLS_INSTALL_DIR=${LOCALBASE} \
34
		-DCMAKE_BUILD_TYPE=Release
35
36
post-install:
37
# Avoid conflict with devel/xxhash
38
	@${RM} ${STAGEDIR}${PREFIX}/include/xxhash.*
39
31
40
.include <bsd.port.mk>
32
.include <bsd.port.mk>
(-)b/devel/vulkan-validation-layers/distinfo (-5 / +5 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1606326879
1
TIMESTAMP = 1607366877
2
SHA256 (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.154.0_GH0.tar.gz) = 8898ab05d0d8dec04fbba03d0ed2e79a1eb5c0382e5c89d4c737b45a6648f7f9
2
SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.2.162_GH0.tar.gz) = 83619b81a86e733383a71ea54f0f5e64e194bf596ee8ec4e36217bb0b29b8917
3
SIZE (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.154.0_GH0.tar.gz) = 2316466
3
SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.2.162_GH0.tar.gz) = 2398927
4
SHA256 (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = aa3c579cd250b23aae735c7c55c3514df4ffc5f98963d95a952bcc89336768bd
4
SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed_GH0.tar.gz) = df2ad2520be4d95a479fa248921065885bbf435a658349a7fc164ad7b26b68c6
5
SIZE (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = 393836
5
SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed_GH0.tar.gz) = 395500
(-)b/devel/vulkan-validation-layers/pkg-plist (-23 / +25 lines)
Lines 1-26 Link Here
1
include/cast_utils.h
1
include/vulkan/cast_utils.h
2
include/hash_util.h
2
include/vulkan/hash_util.h
3
include/hash_vk_types.h
3
include/vulkan/hash_vk_types.h
4
include/vk_dispatch_table_helper.h
4
include/vulkan/vk_dispatch_table_helper.h
5
include/vk_enum_string_helper.h
5
include/vulkan/vk_enum_string_helper.h
6
include/vk_extension_helper.h
6
include/vulkan/vk_extension_helper.h
7
include/vk_format_utils.cpp
7
include/vulkan/vk_format_utils.cpp
8
include/vk_format_utils.h
8
include/vulkan/vk_format_utils.h
9
include/vk_layer_config.cpp
9
include/vulkan/vk_layer_config.cpp
10
include/vk_layer_config.h
10
include/vulkan/vk_layer_config.h
11
include/vk_layer_data.h
11
include/vulkan/vk_layer_data.h
12
include/vk_layer_dispatch_table.h
12
include/vulkan/vk_layer_dispatch_table.h
13
include/vk_layer_extension_utils.cpp
13
include/vulkan/vk_layer_extension_utils.cpp
14
include/vk_layer_extension_utils.h
14
include/vulkan/vk_layer_extension_utils.h
15
include/vk_layer_logging.h
15
include/vulkan/vk_layer_logging.h
16
include/vk_layer_utils.cpp
16
include/vulkan/vk_layer_utils.cpp
17
include/vk_layer_utils.h
17
include/vulkan/vk_layer_utils.h
18
include/vk_loader_platform.h
18
include/vulkan/vk_loader_platform.h
19
include/vk_object_types.h
19
include/vulkan/vk_object_types.h
20
include/vk_safe_struct.cpp
20
include/vulkan/vk_safe_struct.cpp
21
include/vk_safe_struct.h
21
include/vulkan/vk_safe_struct.h
22
include/vk_typemap_helper.h
22
include/vulkan/vk_typemap_helper.h
23
include/vk_validation_error_messages.h
23
include/vulkan/vk_validation_error_messages.h
24
include/vulkan/xxhash.c
25
include/vulkan/xxhash.h
24
lib/libVkLayer_khronos_validation.so
26
lib/libVkLayer_khronos_validation.so
25
lib/libVkLayer_utils.a
27
lib/libVkLayer_utils.a
26
share/vulkan/explicit_layer.d/VkLayer_khronos_validation.json
28
share/vulkan/explicit_layer.d/VkLayer_khronos_validation.json
(-)b/graphics/vulkan-loader/Makefile (-2 / +2 lines)
Lines 1-8 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	vulkan-loader
3
PORTNAME=	vulkan-loader
4
DISTVERSIONPREFIX=sdk-
4
DISTVERSIONPREFIX=v
5
DISTVERSION=	1.2.154.1
5
DISTVERSION=	1.2.162
6
CATEGORIES=	graphics devel
6
CATEGORIES=	graphics devel
7
7
8
MAINTAINER=	greg@unrelenting.technology
8
MAINTAINER=	greg@unrelenting.technology
(-)b/graphics/vulkan-loader/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1602103147
1
TIMESTAMP = 1606148343
2
SHA256 (KhronosGroup-Vulkan-Loader-sdk-1.2.154.1_GH0.tar.gz) = 889e45f7175d915dd0d702013b8021192e181d20f2ad4021c94006088f1edfe5
2
SHA256 (KhronosGroup-Vulkan-Loader-v1.2.162_GH0.tar.gz) = e582dce35051a34af82db2a8fcd38fbc5837b4506e76e6cda685dca02dee01c7
3
SIZE (KhronosGroup-Vulkan-Loader-sdk-1.2.154.1_GH0.tar.gz) = 1417527
3
SIZE (KhronosGroup-Vulkan-Loader-v1.2.162_GH0.tar.gz) = 1421710
(-)b/graphics/vulkan-loader/files/patch-loader_loader.c (-5 / +5 lines)
Lines 1-15 Link Here
1
--- loader/loader.c.orig	2020-04-02 16:20:56 UTC
1
--- loader/loader.c.orig	2020-11-23 16:19:03 UTC
2
+++ loader/loader.c
2
+++ loader/loader.c
3
@@ -234,7 +234,7 @@ void *loader_device_heap_realloc(const struct loader_d
3
@@ -253,7 +253,7 @@ void *loader_device_heap_realloc(const struct loader_d
4
 }
4
 }
5
 
5
 
6
 // Environment variables
6
 // Environment variables
7
-#if defined(__linux__) || defined(__APPLE__)
7
-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__)
8
+#if defined(__unix__)
8
+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__)
9
 
9
 
10
 static inline bool IsHighIntegrity() {
10
 static inline bool IsHighIntegrity() {
11
     return geteuid() != getuid() || getegid() != getgid();
11
     return geteuid() != getuid() || getegid() != getgid();
12
@@ -249,7 +249,7 @@ static inline char *loader_getenv(const char *name, co
12
@@ -268,7 +268,7 @@ static inline char *loader_getenv(const char *name, co
13
 
13
 
14
 static inline char *loader_secure_getenv(const char *name, const struct loader_instance *inst) {
14
 static inline char *loader_secure_getenv(const char *name, const struct loader_instance *inst) {
15
     char *out;
15
     char *out;
(-)b/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h (-6 / +6 lines)
Lines 1-15 Link Here
1
--- loader/vk_loader_platform.h.orig	2020-10-07 20:39:07 UTC
1
--- loader/vk_loader_platform.h.orig	2020-11-23 16:19:03 UTC
2
+++ loader/vk_loader_platform.h
2
+++ loader/vk_loader_platform.h
3
@@ -31,7 +31,7 @@
3
@@ -35,7 +35,7 @@
4
 #include "vulkan/vk_platform.h"
4
 #include "vulkan/vk_platform.h"
5
 #include "vulkan/vk_sdk_platform.h"
5
 #include "vulkan/vk_sdk_platform.h"
6
 
6
 
7
-#if defined(__linux__) || defined(__APPLE__)
7
-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__)
8
+#if defined(__unix__)
8
+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__)
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
12
@@ -120,6 +120,26 @@ static inline char *loader_platform_executable_path(ch
13
     int ret = proc_pidpath(pid, buffer, size);
13
     int ret = proc_pidpath(pid, buffer, size);
14
     if (ret <= 0) return NULL;
14
     if (ret <= 0) return NULL;
15
     buffer[ret] = '\0';
15
     buffer[ret] = '\0';
Lines 35-38 Link Here
35
+
35
+
36
     return buffer;
36
     return buffer;
37
 }
37
 }
38
 #endif  // defined (__APPLE__)
38
 #elif defined(__Fuchsia__)
(-)b/graphics/vulkan-loader/pkg-plist (-1 / +1 lines)
Lines 1-4 Link Here
1
lib/libvulkan.so
1
lib/libvulkan.so
2
lib/libvulkan.so.1
2
lib/libvulkan.so.1
3
lib/libvulkan.so.1.2.154
3
lib/libvulkan.so.1.2.162
4
libdata/pkgconfig/vulkan.pc
4
libdata/pkgconfig/vulkan.pc

Return to bug 251698