From owner-dev-commits-ports-all@freebsd.org Wed Jun 16 14:15:17 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 D6A51663C8E; Wed, 16 Jun 2021 14:15:17 +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 4G4nJj5bYNz4S3d; Wed, 16 Jun 2021 14:15:17 +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 A88B51D240; Wed, 16 Jun 2021 14:15:17 +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 15GEFHsL035123; Wed, 16 Jun 2021 14:15:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15GEFHEI035122; Wed, 16 Jun 2021 14:15:17 GMT (envelope-from git) Date: Wed, 16 Jun 2021 14:15:17 GMT Message-Id: <202106161415.15GEFHEI035122@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: 99a7b10b6f1f - 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: 99a7b10b6f1f3a1d6b7b602466ecb1b320e416fa 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, 16 Jun 2021 14:15:17 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=99a7b10b6f1f3a1d6b7b602466ecb1b320e416fa commit 99a7b10b6f1f3a1d6b7b602466ecb1b320e416fa Author: Jan Beich AuthorDate: 2021-06-15 21:46:17 +0000 Commit: Jan Beich CommitDate: 2021-06-16 14:15:02 +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 | 30 ------------------------------ 3 files changed, 5 insertions(+), 30 deletions(-) diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile index a0471ab0b99d..c21d9369339d 100644 --- a/graphics/vulkan-tools/Makefile +++ b/graphics/vulkan-tools/Makefile @@ -3,6 +3,9 @@ DISTVERSIONPREFIX= v DISTVERSION= 1.2.181 CATEGORIES= graphics +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 02897e9cb615.patch:-p1 # https://github.com/KhronosGroup/Vulkan-Tools/pull/536 + 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 48e6a5b4c9d6..0ea6f770aaec 100644 --- a/graphics/vulkan-tools/distinfo +++ b/graphics/vulkan-tools/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1623697343 SHA256 (KhronosGroup-Vulkan-Tools-v1.2.181_GH0.tar.gz) = 903e03264d6dedc8c9d73d5044f0886e60de79b6849a062c3bd9a69a7667d069 SIZE (KhronosGroup-Vulkan-Tools-v1.2.181_GH0.tar.gz) = 846689 +SHA256 (02897e9cb615.patch) = 040384f564b8d174a17a9236bdfd80deac8ec848c37cea9049cbeb2f25574215 +SIZE (02897e9cb615.patch) = 1120 diff --git a/graphics/vulkan-tools/files/patch-werror b/graphics/vulkan-tools/files/patch-werror index 129e4f155f35..4ec9e9c6c9ca 100644 --- a/graphics/vulkan-tools/files/patch-werror +++ b/graphics/vulkan-tools/files/patch-werror @@ -1,36 +1,6 @@ Silence Clang warnings that GCC ignores -https://github.com/KhronosGroup/Vulkan-Tools/issues/531 https://github.com/KhronosGroup/Vulkan-Tools/issues/532 ---- cube/cube.c.orig 2021-06-14 19:02:23 UTC -+++ cube/cube.c -@@ -3027,12 +3027,12 @@ static VkResult demo_create_display_surface(struct dem - VkDisplayPlaneCapabilitiesKHR planeCaps; - vkGetDisplayPlaneCapabilitiesKHR(demo->gpu, mode_props.displayMode, plane_index, &planeCaps); - // Find a supported alpha mode -- VkCompositeAlphaFlagBitsKHR alphaMode = VK_DISPLAY_PLANE_ALPHA_OPAQUE_BIT_KHR; -+ VkCompositeAlphaFlagBitsKHR alphaMode = (VkCompositeAlphaFlagBitsKHR)VK_DISPLAY_PLANE_ALPHA_OPAQUE_BIT_KHR; - VkCompositeAlphaFlagBitsKHR alphaModes[4] = { -- VK_DISPLAY_PLANE_ALPHA_OPAQUE_BIT_KHR, -- VK_DISPLAY_PLANE_ALPHA_GLOBAL_BIT_KHR, -- VK_DISPLAY_PLANE_ALPHA_PER_PIXEL_BIT_KHR, -- VK_DISPLAY_PLANE_ALPHA_PER_PIXEL_PREMULTIPLIED_BIT_KHR, -+ (VkCompositeAlphaFlagBitsKHR)VK_DISPLAY_PLANE_ALPHA_OPAQUE_BIT_KHR, -+ (VkCompositeAlphaFlagBitsKHR)VK_DISPLAY_PLANE_ALPHA_GLOBAL_BIT_KHR, -+ (VkCompositeAlphaFlagBitsKHR)VK_DISPLAY_PLANE_ALPHA_PER_PIXEL_BIT_KHR, -+ (VkCompositeAlphaFlagBitsKHR)VK_DISPLAY_PLANE_ALPHA_PER_PIXEL_PREMULTIPLIED_BIT_KHR, - }; - for (uint32_t i = 0; i < sizeof(alphaModes); i++) { - if (planeCaps.supportedAlpha & alphaModes[i]) { -@@ -3050,7 +3050,7 @@ static VkResult demo_create_display_surface(struct dem - create_info.planeIndex = plane_index; - create_info.planeStackIndex = plane_props[plane_index].currentStackIndex; - create_info.transform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR; -- create_info.alphaMode = alphaMode; -+ create_info.alphaMode = (VkDisplayPlaneAlphaFlagBitsKHR)alphaMode; - create_info.globalAlpha = 1.0f; - create_info.imageExtent = image_extent; - --- cube/cube.cpp.orig 2021-06-14 19:02:23 UTC +++ cube/cube.cpp @@ -405,16 +405,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM