aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2021-04-20 16:45:05 +0000
committerJan Beich <jbeich@FreeBSD.org>2021-04-21 17:42:47 +0000
commitbba925e1282aefdda91a9171877c279b52d3bde8 (patch)
tree5fa9c11bd435f0ca53f89d8dc0b6554ee6d6d0ec
parenta88b69a2727e3a8cc572de7e2082832f0b7c317c (diff)
downloadports-bba925e1282aefdda91a9171877c279b52d3bde8.tar.gz
ports-bba925e1282aefdda91a9171877c279b52d3bde8.zip
graphics/vulkan-loader: update to 1.2.176
-rw-r--r--graphics/vulkan-loader/Makefile3
-rw-r--r--graphics/vulkan-loader/distinfo6
-rw-r--r--graphics/vulkan-loader/files/patch-cmake_FindVulkanHeaders.cmake39
-rw-r--r--graphics/vulkan-loader/files/patch-loader_loader.c6
-rw-r--r--graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h6
5 files changed, 10 insertions, 50 deletions
diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile
index d057c160c6d6..c6c9c4e35851 100644
--- a/graphics/vulkan-loader/Makefile
+++ b/graphics/vulkan-loader/Makefile
@@ -1,7 +1,6 @@
PORTNAME= vulkan-loader
DISTVERSIONPREFIX= v
-DISTVERSION= 1.2.174
-PORTREVISION= 1
+DISTVERSION= 1.2.176
CATEGORIES= graphics devel
MAINTAINER= jbeich@FreeBSD.org
diff --git a/graphics/vulkan-loader/distinfo b/graphics/vulkan-loader/distinfo
index 017b7c497182..329a96075fbf 100644
--- a/graphics/vulkan-loader/distinfo
+++ b/graphics/vulkan-loader/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617048347
-SHA256 (KhronosGroup-Vulkan-Loader-v1.2.174_GH0.tar.gz) = c39a660da13450cb5e2d1dc571749d0e9a4f831998b20a7ad9fc7f2c99e1bb0b
-SIZE (KhronosGroup-Vulkan-Loader-v1.2.174_GH0.tar.gz) = 1423922
+TIMESTAMP = 1618937105
+SHA256 (KhronosGroup-Vulkan-Loader-v1.2.176_GH0.tar.gz) = 9a7cf743bea8bfc7bd8c0527079eea122a95cd2baaf61d1c8589168670e4a152
+SIZE (KhronosGroup-Vulkan-Loader-v1.2.176_GH0.tar.gz) = 1430058
diff --git a/graphics/vulkan-loader/files/patch-cmake_FindVulkanHeaders.cmake b/graphics/vulkan-loader/files/patch-cmake_FindVulkanHeaders.cmake
deleted file mode 100644
index ad836da3157d..000000000000
--- a/graphics/vulkan-loader/files/patch-cmake_FindVulkanHeaders.cmake
+++ /dev/null
@@ -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})
diff --git a/graphics/vulkan-loader/files/patch-loader_loader.c b/graphics/vulkan-loader/files/patch-loader_loader.c
index 36450777becf..30b588023daa 100644
--- a/graphics/vulkan-loader/files/patch-loader_loader.c
+++ b/graphics/vulkan-loader/files/patch-loader_loader.c
@@ -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
@@ -253,7 +253,7 @@ void *loader_device_heap_realloc(const struct loader_d
}
// Environment variables
--#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__)
-+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__)
+-#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();
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 31c41bac9716..888712684920 100644
--- a/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h
+++ b/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h
@@ -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
@@ -35,7 +35,7 @@
#include "vulkan/vk_platform.h"
#include "vulkan/vk_sdk_platform.h"
--#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__)
-+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__)
+-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
++#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
/* Linux-specific common code: */
// Headers: