From f0f859d57917f338735d10eff7a6ced367accbc8 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Wed, 15 Sep 2021 16:41:50 +0000 Subject: graphics/vulkan-loader: update to 1.2.192 Changes: https://github.com/KhronosGroup/Vulkan-Loader/compare/v1.2.191...v1.2.192 Reported by: portscout (cherry picked from commit 79f3c80d7631f2c3d9ee9fc06cf9bba058c77970) --- graphics/vulkan-loader/Makefile | 8 ++++++-- 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 +++++++++++ graphics/vulkan-loader/files/patch-loader_loader.c | 20 -------------------- .../files/patch-loader_vk__loader__platform.h | 21 +++++++++++++++------ graphics/vulkan-loader/pkg-plist | 2 +- 8 files changed, 67 insertions(+), 32 deletions(-) create mode 100644 graphics/vulkan-loader/files/patch-loader_allocation.h create mode 100644 graphics/vulkan-loader/files/patch-loader_get__environment.c create mode 100644 graphics/vulkan-loader/files/patch-loader_get__environment.h delete mode 100644 graphics/vulkan-loader/files/patch-loader_loader.c diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 1f71038a5cc8..6aadb51b4824 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,7 +1,6 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v -DISTVERSION= 1.2.191 -PORTREVISION= 1 +DISTVERSION= 1.2.192 CATEGORIES= graphics devel MAINTAINER= jbeich@FreeBSD.org @@ -38,5 +37,10 @@ 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 +# Extract (snapshot) version from the port + @${REINPLACE_CMD} -e '/find_.*Git/d' \ + -e '/BRANCH/s/--unknown--/main/' \ + -e '/TAG/s/--unknown--/${DISTVERSIONFULL}/' \ + ${WRKSRC}/CMakeLists.txt .include diff --git a/graphics/vulkan-loader/distinfo b/graphics/vulkan-loader/distinfo index 20603c0c694e..e7f6b9dd69d3 100644 --- a/graphics/vulkan-loader/distinfo +++ b/graphics/vulkan-loader/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1631139753 -SHA256 (KhronosGroup-Vulkan-Loader-v1.2.191_GH0.tar.gz) = f884765bc5a2fb5f6f810adfe5cb53ffe5541f2b423d13e1953205fd2028deff -SIZE (KhronosGroup-Vulkan-Loader-v1.2.191_GH0.tar.gz) = 1512057 +TIMESTAMP = 1631724110 +SHA256 (KhronosGroup-Vulkan-Loader-v1.2.192_GH0.tar.gz) = 5af8057836c9624ccd9408c038ec693ab464758183243133c91bb1a6ed64d950 +SIZE (KhronosGroup-Vulkan-Loader-v1.2.192_GH0.tar.gz) = 1517086 diff --git a/graphics/vulkan-loader/files/patch-loader_allocation.h b/graphics/vulkan-loader/files/patch-loader_allocation.h new file mode 100644 index 000000000000..b756ec0b7540 --- /dev/null +++ b/graphics/vulkan-loader/files/patch-loader_allocation.h @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..553951da1f88 --- /dev/null +++ b/graphics/vulkan-loader/files/patch-loader_get__environment.c @@ -0,0 +1,20 @@ +--- 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 new file mode 100644 index 000000000000..5b192b3e69e4 --- /dev/null +++ b/graphics/vulkan-loader/files/patch-loader_get__environment.h @@ -0,0 +1,11 @@ +--- 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_loader.c b/graphics/vulkan-loader/files/patch-loader_loader.c deleted file mode 100644 index efbe9d26058e..000000000000 --- a/graphics/vulkan-loader/files/patch-loader_loader.c +++ /dev/null @@ -1,20 +0,0 @@ ---- loader/loader.c.orig 2021-04-29 17:49:58 UTC -+++ loader/loader.c -@@ -253,7 +253,7 @@ void *loader_device_heap_realloc(const struct loader_d - } - - // Environment variables --#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) -+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) - - static inline bool IsHighIntegrity() { - return geteuid() != getuid() || getegid() != getgid(); -@@ -267,7 +267,7 @@ static inline char *loader_getenv(const char *name, co - } - - static inline 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_vk__loader__platform.h b/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h index 888712684920..9be2f5fdc6f3 100644 --- a/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h +++ b/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h @@ -1,15 +1,24 @@ ---- loader/vk_loader_platform.h.orig 2021-04-20 16:45:05 UTC +--- loader/vk_loader_platform.h.orig 2021-09-15 16:41:50 UTC +++ loader/vk_loader_platform.h -@@ -35,7 +35,7 @@ - #include "vulkan/vk_platform.h" - #include "vulkan/vk_sdk_platform.h" +@@ -37,7 +37,7 @@ + #include "dlopen_fuchsia.h" + #endif // defined(__Fuchsia__) + +-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) ++#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) + #include + // Note: The following file is for dynamic loading: + #include +@@ -97,7 +97,7 @@ + // Override layer information + #define VK_OVERRIDE_LAYER_NAME "VK_LAYER_LUNARG_override" -#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) +#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) /* Linux-specific common code: */ - // Headers: -@@ -120,6 +120,26 @@ static inline char *loader_platform_executable_path(ch + // 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'; diff --git a/graphics/vulkan-loader/pkg-plist b/graphics/vulkan-loader/pkg-plist index 6ef15948aed9..c408c6fb6b16 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.191 +lib/libvulkan.so.1.2.192 libdata/pkgconfig/vulkan.pc -- cgit v1.2.3