From owner-dev-commits-ports-all@freebsd.org Wed Jun 23 20:11:51 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 57724656B9E; Wed, 23 Jun 2021 20:11:51 +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 4G9Dtv241rz3npx; Wed, 23 Jun 2021 20:11:51 +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 2FFAF235E; Wed, 23 Jun 2021 20:11:51 +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 15NKBpbH068673; Wed, 23 Jun 2021 20:11:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15NKBpod068672; Wed, 23 Jun 2021 20:11:51 GMT (envelope-from git) Date: Wed, 23 Jun 2021 20:11:51 GMT Message-Id: <202106232011.15NKBpod068672@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: bdcad6245f21 - main - graphics/vulkan-tools: switch to upstream -Werror fix 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: bdcad6245f212977b7b0412b07bfd369f7990fa3 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, 23 Jun 2021 20:11:51 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=bdcad6245f212977b7b0412b07bfd369f7990fa3 commit bdcad6245f212977b7b0412b07bfd369f7990fa3 Author: Jan Beich AuthorDate: 2021-06-23 18:33:32 +0000 Commit: Jan Beich CommitDate: 2021-06-23 20:11:20 +0000 graphics/vulkan-tools: switch to upstream -Werror fix --- graphics/vulkan-tools/Makefile | 3 +++ graphics/vulkan-tools/distinfo | 2 ++ graphics/vulkan-tools/files/patch-werror | 20 -------------------- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile index cb6575a3dba8..d1947d970637 100644 --- a/graphics/vulkan-tools/Makefile +++ b/graphics/vulkan-tools/Makefile @@ -3,6 +3,9 @@ DISTVERSIONPREFIX= v DISTVERSION= 1.2.182 CATEGORIES= graphics +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 8926213dd008.patch:-p1 # https://github.com/KhronosGroup/Vulkan-Tools/pull/544 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Tools and demos for the Vulkan graphics API diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo index 85bca30da68d..e2a358148133 100644 --- a/graphics/vulkan-tools/distinfo +++ b/graphics/vulkan-tools/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1624299185 SHA256 (KhronosGroup-Vulkan-Tools-v1.2.182_GH0.tar.gz) = 50c959851230d1daba20235167faced7b7686ebe5d9e626dfb1fe5c92fa30b9e SIZE (KhronosGroup-Vulkan-Tools-v1.2.182_GH0.tar.gz) = 847991 +SHA256 (8926213dd008.patch) = 4e22c90a53c4f7f7623da18ba6f097a49e9a6100fb5c4fb738a98e62d445bfaf +SIZE (8926213dd008.patch) = 1140 diff --git a/graphics/vulkan-tools/files/patch-werror b/graphics/vulkan-tools/files/patch-werror deleted file mode 100644 index e6a979defc7c..000000000000 --- a/graphics/vulkan-tools/files/patch-werror +++ /dev/null @@ -1,20 +0,0 @@ -Silence Clang warnings that GCC ignores -https://github.com/KhronosGroup/Vulkan-Tools/issues/532 - ---- cube/cube.cpp.orig 2021-06-21 18:13:05 UTC -+++ cube/cube.cpp -@@ -405,14 +405,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM - #endif - - #if defined(VK_USE_PLATFORM_WAYLAND_KHR) --static void handle_ping(void *data, wl_shell_surface *shell_surface, uint32_t serial) { -- wl_shell_surface_pong(shell_surface, serial); --} -- --static void handle_configure(void *data, wl_shell_surface *shell_surface, uint32_t edges, int32_t width, int32_t height) {} -- --static void handle_popup_done(void *data, wl_shell_surface *shell_surface) {} -- - static void pointer_handle_enter(void *data, struct wl_pointer *pointer, uint32_t serial, struct wl_surface *surface, wl_fixed_t sx, - wl_fixed_t sy) {} -