graphics/vulkan-loader: update to 1.2.176

Changes:	https://github.com/KhronosGroup/Vulkan-Loader/compare/v1.2.174...v1.2.176
Reported by:	portscout
This commit is contained in:
Jan Beich 2021-04-20 16:45:05 +00:00
parent a88b69a272
commit bba925e128
5 changed files with 10 additions and 50 deletions

View file

@ -1,7 +1,6 @@
PORTNAME= vulkan-loader PORTNAME= vulkan-loader
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
DISTVERSION= 1.2.174 DISTVERSION= 1.2.176
PORTREVISION= 1
CATEGORIES= graphics devel CATEGORIES= graphics devel
MAINTAINER= jbeich@FreeBSD.org MAINTAINER= jbeich@FreeBSD.org

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1617048347 TIMESTAMP = 1618937105
SHA256 (KhronosGroup-Vulkan-Loader-v1.2.174_GH0.tar.gz) = c39a660da13450cb5e2d1dc571749d0e9a4f831998b20a7ad9fc7f2c99e1bb0b SHA256 (KhronosGroup-Vulkan-Loader-v1.2.176_GH0.tar.gz) = 9a7cf743bea8bfc7bd8c0527079eea122a95cd2baaf61d1c8589168670e4a152
SIZE (KhronosGroup-Vulkan-Loader-v1.2.174_GH0.tar.gz) = 1423922 SIZE (KhronosGroup-Vulkan-Loader-v1.2.176_GH0.tar.gz) = 1430058

View file

@ -1,39 +0,0 @@
Part of https://github.com/KhronosGroup/Vulkan-Loader/commit/eb6d6f95dff8
$ make check-plist
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: lib/libvulkan.so.0.0.176
===> Checking for items in pkg-plist which are not in STAGEDIR
Error: Missing: lib/libvulkan.so.1.2.176
===> Error: Plist issues found.
*** Error code 1
--- cmake/FindVulkanHeaders.cmake.orig 2021-03-29 20:05:47 UTC
+++ cmake/FindVulkanHeaders.cmake
@@ -114,19 +114,19 @@ endif()
file(STRINGS
${VulkanHeaders_main_header}
VulkanHeaders_lines
- REGEX "^#define (VK_API_VERSION.*VK_MAKE_VERSION|VK_HEADER_VERSION)")
+ REGEX "^#define VK_HEADER_VERSION(_COMPLETE)? ")
foreach(VulkanHeaders_line ${VulkanHeaders_lines})
# First, handle the case where we have a major/minor version
# Format is:
- # #define VK_API_VERSION_X_Y VK_MAKE_VERSION(X, Y, 0)
+ # #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, X, Y, VK_HEADER_VERSION)
# We grab the major version (X) and minor version (Y) out of the parentheses
- string(REGEX MATCH "VK_MAKE_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line})
+ string(REGEX MATCH "VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line})
string(REGEX MATCHALL "[0-9]+" VulkanHeaders_MAJOR_MINOR "${VulkanHeaders_out}")
if (VulkanHeaders_MAJOR_MINOR)
- list (GET VulkanHeaders_MAJOR_MINOR 0 VulkanHeaders_cur_major)
- list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_minor)
+ list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_major)
+ list (GET VulkanHeaders_MAJOR_MINOR 2 VulkanHeaders_cur_minor)
if (${VulkanHeaders_cur_major} GREATER ${VulkanHeaders_VERSION_MAJOR})
set(VulkanHeaders_VERSION_MAJOR ${VulkanHeaders_cur_major})
set(VulkanHeaders_VERSION_MINOR ${VulkanHeaders_cur_minor})

View file

@ -1,11 +1,11 @@
--- loader/loader.c.orig 2020-11-23 16:19:03 UTC --- loader/loader.c.orig 2021-04-20 16:45:05 UTC
+++ loader/loader.c +++ loader/loader.c
@@ -253,7 +253,7 @@ void *loader_device_heap_realloc(const struct loader_d @@ -253,7 +253,7 @@ void *loader_device_heap_realloc(const struct loader_d
} }
// Environment variables // Environment variables
-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) -#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) +#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
static inline bool IsHighIntegrity() { static inline bool IsHighIntegrity() {
return geteuid() != getuid() || getegid() != getgid(); return geteuid() != getuid() || getegid() != getgid();

View file

@ -1,11 +1,11 @@
--- loader/vk_loader_platform.h.orig 2020-11-23 16:19:03 UTC --- loader/vk_loader_platform.h.orig 2021-04-20 16:45:05 UTC
+++ loader/vk_loader_platform.h +++ loader/vk_loader_platform.h
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
#include "vulkan/vk_platform.h" #include "vulkan/vk_platform.h"
#include "vulkan/vk_sdk_platform.h" #include "vulkan/vk_sdk_platform.h"
-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) -#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) +#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
/* Linux-specific common code: */ /* Linux-specific common code: */
// Headers: // Headers: