From owner-dev-commits-ports-branches@freebsd.org Wed Aug 4 12:18:04 2021 Return-Path: Delivered-To: dev-commits-ports-branches@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 A81CC65D440; Wed, 4 Aug 2021 12:18:04 +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 4GfrNr43vZz3pC4; Wed, 4 Aug 2021 12:18:04 +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 6892F265BC; Wed, 4 Aug 2021 12:18:04 +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 174CI4Ax006120; Wed, 4 Aug 2021 12:18:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 174CI463006119; Wed, 4 Aug 2021 12:18:04 GMT (envelope-from git) Date: Wed, 4 Aug 2021 12:18:04 GMT Message-Id: <202108041218.174CI463006119@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: b1b28f3d2c12 - 2021Q3 - graphics/vulkan-tools: update to 1.2.185 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/2021Q3 X-Git-Reftype: branch X-Git-Commit: b1b28f3d2c1279bdd86140231ede0e890a5126e5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Aug 2021 12:18:04 -0000 The branch 2021Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1b28f3d2c1279bdd86140231ede0e890a5126e5 commit b1b28f3d2c1279bdd86140231ede0e890a5126e5 Author: Jan Beich AuthorDate: 2021-07-21 18:21:37 +0000 Commit: Jan Beich CommitDate: 2021-08-04 12:05:34 +0000 graphics/vulkan-tools: update to 1.2.185 Changes: https://github.com/KhronosGroup/Vulkan-Tools/compare/v1.2.184...v1.2.185 Reported by: portscout (cherry picked from commit fe2114db68bf93c22a7262e38139f72729139b85) --- graphics/vulkan-tools/Makefile | 4 +- graphics/vulkan-tools/distinfo | 6 +-- graphics/vulkan-tools/files/patch-cube_cube.cpp | 11 ------ .../files/patch-vulkaninfo_vulkaninfo.h | 45 ---------------------- 4 files changed, 5 insertions(+), 61 deletions(-) diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile index dbb3958e9078..2e3a9d729591 100644 --- a/graphics/vulkan-tools/Makefile +++ b/graphics/vulkan-tools/Makefile @@ -1,6 +1,6 @@ PORTNAME= vulkan-tools DISTVERSIONPREFIX= v -DISTVERSION= 1.2.184 +DISTVERSION= 1.2.185 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org @@ -12,7 +12,7 @@ BUILD_DEPENDS= glslangValidator:graphics/glslang \ vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader -USES= cmake compiler:c++11-lib pkgconfig python:3.4+,build +USES= alias cmake compiler:c++11-lib pkgconfig python:3.4+,build USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Tools diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo index d2371629bb08..fb4ff57ab9c8 100644 --- a/graphics/vulkan-tools/distinfo +++ b/graphics/vulkan-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625605987 -SHA256 (KhronosGroup-Vulkan-Tools-v1.2.184_GH0.tar.gz) = fc0730eae7c9b7c760af92aa465697c5e97c6519f4bf1624a147de9b5a4a0a4c -SIZE (KhronosGroup-Vulkan-Tools-v1.2.184_GH0.tar.gz) = 847971 +TIMESTAMP = 1626891697 +SHA256 (KhronosGroup-Vulkan-Tools-v1.2.185_GH0.tar.gz) = 29b34497daf940e3e36f5a9a64079de6d7e2d39e3ca1d4f5a771122dbb556089 +SIZE (KhronosGroup-Vulkan-Tools-v1.2.185_GH0.tar.gz) = 849135 diff --git a/graphics/vulkan-tools/files/patch-cube_cube.cpp b/graphics/vulkan-tools/files/patch-cube_cube.cpp deleted file mode 100644 index 12fdcff31e5e..000000000000 --- a/graphics/vulkan-tools/files/patch-cube_cube.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- cube/cube.cpp.orig 2020-04-08 02:52:46 UTC -+++ cube/cube.cpp -@@ -2999,7 +2999,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre - return (int)msg.wParam; - } - --#elif __linux__ -+#elif __unix__ - - int main(int argc, char **argv) { - Demo demo; diff --git a/graphics/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h b/graphics/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h deleted file mode 100644 index c242706cec6d..000000000000 --- a/graphics/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h +++ /dev/null @@ -1,45 +0,0 @@ ---- vulkaninfo/vulkaninfo.h.orig 2020-04-08 02:52:46 UTC -+++ vulkaninfo/vulkaninfo.h -@@ -60,7 +60,7 @@ - #include - #endif // _WIN32 - --#if defined(__linux__) || defined(__APPLE__) -+#if defined(__unix__) || defined(__APPLE__) - #include - #endif - -@@ -253,7 +253,7 @@ auto GetVector(const char *func_name, F &&f, Ts &&... - // ----------- Instance Setup ------- // - struct VkDll { - VkResult Initialize() { --#if defined(__linux__) -+#if defined(__unix__) - library = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL); - if (!library) library = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL); - #elif defined(_WIN32) -@@ -265,7 +265,7 @@ struct VkDll { - return VK_SUCCESS; - } - void Close() { --#if defined(__linux__) -+#if defined(__unix__) - dlclose(library); - #elif defined(_WIN32) - FreeLibrary(library); -@@ -427,13 +427,13 @@ struct VkDll { - private: - template - void Load(T &func_dest, const char *func_name) { --#if defined(__linux__) -+#if defined(__unix__) - func_dest = reinterpret_cast(dlsym(library, func_name)); - #elif defined(_WIN32) - func_dest = reinterpret_cast(GetProcAddress(library, func_name)); - #endif - } --#if defined(__linux__) -+#if defined(__unix__) - void *library; - #elif defined(_WIN32) - HMODULE library;