git: a536ea6157b8 - main - graphics/vulkan-loader: update to 1.2.197
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 03 Nov 2021 22:00:27 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a536ea6157b85508f8e0aa7a28dd7c3f7ffaf8c0
commit a536ea6157b85508f8e0aa7a28dd7c3f7ffaf8c0
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-11-03 16:21:38 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-11-03 21:59:20 +0000
graphics/vulkan-loader: update to 1.2.197
Changes: https://github.com/KhronosGroup/Vulkan-Loader/compare/v1.2.196...v1.2.197
Reported by: portscout
---
graphics/vulkan-loader/Makefile | 5 +--
graphics/vulkan-loader/distinfo | 6 +--
.../vulkan-loader/files/patch-loader_allocation.h | 11 -----
.../files/patch-loader_get__environment.c | 20 ---------
.../files/patch-loader_get__environment.h | 11 -----
.../files/patch-loader_vk__loader__platform.h | 50 +++-------------------
graphics/vulkan-loader/pkg-plist | 2 +-
7 files changed, 13 insertions(+), 92 deletions(-)
diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile
index cba8b59a4359..a7f3bad5381d 100644
--- a/graphics/vulkan-loader/Makefile
+++ b/graphics/vulkan-loader/Makefile
@@ -1,7 +1,6 @@
PORTNAME= vulkan-loader
DISTVERSIONPREFIX= v
-DISTVERSION= 1.2.196
-PORTREVISION= 1
+DISTVERSION= 1.2.197
CATEGORIES= graphics devel
MAINTAINER= jbeich@FreeBSD.org
@@ -11,7 +10,7 @@ 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
+USES= alias cmake compiler:${ARCH:Mi386:C/.+/gcc-/}c++11-lib pkgconfig python:3.4+,build
USE_GITHUB= yes
USE_LDCONFIG= yes
GH_ACCOUNT= KhronosGroup
diff --git a/graphics/vulkan-loader/distinfo b/graphics/vulkan-loader/distinfo
index d8d826e92299..c797350af85d 100644
--- a/graphics/vulkan-loader/distinfo
+++ b/graphics/vulkan-loader/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634231575
-SHA256 (KhronosGroup-Vulkan-Loader-v1.2.196_GH0.tar.gz) = fd7bc148ecd75e3437edd25d9f8d53774be444e424079928ab014e968a7a1385
-SIZE (KhronosGroup-Vulkan-Loader-v1.2.196_GH0.tar.gz) = 1488960
+TIMESTAMP = 1635956498
+SHA256 (KhronosGroup-Vulkan-Loader-v1.2.197_GH0.tar.gz) = fd1bf11dfa62ed118fc3537c849e6619e2c7b84598b60a2ad89f7af553eb29d6
+SIZE (KhronosGroup-Vulkan-Loader-v1.2.197_GH0.tar.gz) = 1436996
diff --git a/graphics/vulkan-loader/files/patch-loader_allocation.h b/graphics/vulkan-loader/files/patch-loader_allocation.h
deleted file mode 100644
index b756ec0b7540..000000000000
--- a/graphics/vulkan-loader/files/patch-loader_allocation.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- loader/allocation.h.orig 2021-09-15 16:41:50 UTC
-+++ loader/allocation.h
-@@ -39,7 +39,7 @@ void loader_device_heap_free(const struct loader_devic
- void *loader_device_heap_realloc(const struct loader_device *device, void *pMemory, size_t orig_size, size_t size,
- VkSystemAllocationScope alloc_scope);
-
--#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
-+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
- #define loader_stack_alloc(size) alloca(size)
- #elif defined(_WIN32)
- #define loader_stack_alloc(size) _alloca(size)
diff --git a/graphics/vulkan-loader/files/patch-loader_get__environment.c b/graphics/vulkan-loader/files/patch-loader_get__environment.c
deleted file mode 100644
index 553951da1f88..000000000000
--- a/graphics/vulkan-loader/files/patch-loader_get__environment.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- loader/get_environment.c.orig 2021-09-15 16:41:50 UTC
-+++ loader/get_environment.c
-@@ -31,7 +31,7 @@
- #include "log.h"
-
- // Environment variables
--#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
-+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
-
- bool is_high_integrity() { return geteuid() != getuid() || getegid() != getgid(); }
-
-@@ -43,7 +43,7 @@ char *loader_getenv(const char *name, const struct loa
- }
-
- char *loader_secure_getenv(const char *name, const struct loader_instance *inst) {
--#if defined(__APPLE__)
-+#if !defined(__linux__)
- // Apple does not appear to have a secure getenv implementation.
- // The main difference between secure getenv and getenv is that secure getenv
- // returns NULL if the process is being run with elevated privileges by a normal user.
diff --git a/graphics/vulkan-loader/files/patch-loader_get__environment.h b/graphics/vulkan-loader/files/patch-loader_get__environment.h
deleted file mode 100644
index 5b192b3e69e4..000000000000
--- a/graphics/vulkan-loader/files/patch-loader_get__environment.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- loader/get_environment.h.orig 2021-09-15 16:41:50 UTC
-+++ loader/get_environment.h
-@@ -35,7 +35,7 @@
- char *loader_getenv(const char *name, const struct loader_instance *inst);
- void loader_free_getenv(char *val, const struct loader_instance *inst);
-
--#if defined(WIN32) || defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
-+#if defined(WIN32) || defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
-
- bool is_high_integrity();
-
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 9be2f5fdc6f3..9d07571f9242 100644
--- a/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h
+++ b/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h
@@ -1,47 +1,11 @@
---- loader/vk_loader_platform.h.orig 2021-09-15 16:41:50 UTC
+--- loader/vk_loader_platform.h.orig 2021-11-03 16:21:38 UTC
+++ loader/vk_loader_platform.h
-@@ -37,7 +37,7 @@
- #include "dlopen_fuchsia.h"
- #endif // defined(__Fuchsia__)
+@@ -156,7 +156,7 @@ static inline bool loader_platform_is_path_absolute(co
--#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
-+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
- #include <unistd.h>
- // Note: The following file is for dynamic loading:
- #include <dlfcn.h>
-@@ -97,7 +97,7 @@
- // Override layer information
- #define VK_OVERRIDE_LAYER_NAME "VK_LAYER_LUNARG_override"
+ static inline char *loader_platform_dirname(char *path) { return dirname(path); }
--#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
-+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
- /* Linux-specific common code: */
+-#if defined(__linux__) || defined(__FreeBSD__)
++#if defined(__linux__)
- // VK Library Filenames, Paths, etc.:
-@@ -168,6 +168,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;
- }
- #elif defined(__Fuchsia__)
+ // find application path + name. Path cannot be longer than 1024, returns NULL if it is greater than that.
+ static inline char *loader_platform_executable_path(char *buffer, size_t size) {
diff --git a/graphics/vulkan-loader/pkg-plist b/graphics/vulkan-loader/pkg-plist
index f20a697c22fc..4c19c88720dc 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.196
+lib/libvulkan.so.1.2.197
libdata/pkgconfig/vulkan.pc