From owner-dev-commits-ports-all@freebsd.org Wed Apr 21 17:44:06 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1CD2D5ECBC2; Wed, 21 Apr 2021 17:44:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQSbT71jWz3qMs; Wed, 21 Apr 2021 17:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BE8702634; Wed, 21 Apr 2021 17:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13LHi54M002852; Wed, 21 Apr 2021 17:44:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13LHi5FK002851; Wed, 21 Apr 2021 17:44:05 GMT (envelope-from git) Date: Wed, 21 Apr 2021 17:44:05 GMT Message-Id: <202104211744.13LHi5FK002851@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: bba925e1282a - main - graphics/vulkan-loader: update to 1.2.176 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bba925e1282aefdda91a9171877c279b52d3bde8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 17:44:06 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=bba925e1282aefdda91a9171877c279b52d3bde8 commit bba925e1282aefdda91a9171877c279b52d3bde8 Author: Jan Beich AuthorDate: 2021-04-20 16:45:05 +0000 Commit: Jan Beich CommitDate: 2021-04-21 17:42:47 +0000 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 --- graphics/vulkan-loader/Makefile | 3 +- graphics/vulkan-loader/distinfo | 6 ++-- .../files/patch-cmake_FindVulkanHeaders.cmake | 39 ---------------------- graphics/vulkan-loader/files/patch-loader_loader.c | 6 ++-- .../files/patch-loader_vk__loader__platform.h | 6 ++-- 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: