From nobody Fri Jun 30 21:33:11 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qt7pc1BVtz4lFxh; Fri, 30 Jun 2023 21:33:12 +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 4Qt7pc0kmRz3wbZ; Fri, 30 Jun 2023 21:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688160792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6iwW+OnPhIcprOlKVguOpFTX4D4zmWexPMHW5rr0QLY=; b=BvcQ2JuSS02AvG75kzmevtM2Sh79Ly07YBNt/SZBC3jzfrXQfEyxYA4Pm/goarRJnMxouo vEjCITs238K8p97AYEB1cgHTSWxWWdO3HqnREgC9/koCURarYbiMXAwpWJMr/xuKZDXuWP ig2eeo3n7I0QR2noR6f03Yo4YHkunfpd63h7LFysGNUk/s2XjcTXaIpxqDQ1J7n1jZ5dNk ac0RYqrgJpI0Q7/Z/NVeVX7epDyNRHJXEqIHqOp0s3X5+K5I8KxgwaIZfEd1UcR+hmdkN8 0IbjDlKAd1dAH7pmXigjvUYk1xyiy4XkfVGe6U0qSD88lCmgKlJ6sJu5eFuvDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688160792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6iwW+OnPhIcprOlKVguOpFTX4D4zmWexPMHW5rr0QLY=; b=krdNZ1ISzZyTKdBRCw9natfxMLP7m772B1O+kGl1S/axnDligZ4AjDbR6dcYCiizE6gmL+ uXqwCg2k8xwRirpmt0/jmH0WF94ikyyz3kfjXHjETKdtjw7j/s/3W9LF3ONqB6Q88MFqwe b0czVnYoyxZia6/YTE69wAcM+QoQlVEC2bYmo3qtNhZpHtjiO+qNSHxr553FdwrHFYbmxa Tkj5DV0HdWMAOmHPS5/hoE/k9RSq5B1dPo4T3sszd/xGtkep6fHvGkMnSIOZVrEbfR24fO D8GAjvFOp7HJpzi2gNRw0PzD/K1V8zJV1abJ8etzuVQNbhGqS4pa2Vt4yycazA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688160792; a=rsa-sha256; cv=none; b=ShPkrRephXS2kB9xwX2El0GHTdXhMYEpl5buP6Jj8THXBcRFn+OuOBeOpODUGmV+N+bevD pt3V2fL7CyQJX7gY+BiwGF7kBYNYmwzJrGMQ3X0ouBMk8dalitoZr0bpfge+eQLq48At0O An/ixUxm4m8ueLJ/juzOK74CwSTWnt8I8DJontAHATZ6lH7f19yDO5yl8k/LONFFys6SqX LLeyg+d+OjsCgHiI1T+IGy6ZoaiWO21RlXGal36he0mA3LSlVzpeeNUEQ+b96T5J3agFmI mzblgBY+mvBBBIOeXgi6jPUzepN42tjaiSa9fEBc9o3SUsmLwkI8O7uG9vbk7A== 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 4Qt7pb6v3qz1Dn5; Fri, 30 Jun 2023 21:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35ULXB8D095612; Fri, 30 Jun 2023 21:33:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35ULXBH1095611; Fri, 30 Jun 2023 21:33:11 GMT (envelope-from git) Date: Fri, 30 Jun 2023 21:33:11 GMT Message-Id: <202306302133.35ULXBH1095611@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: 2ddbe6ca86b8 - main - graphics/vulkan-headers: update to 1.3.256 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org 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: 2ddbe6ca86b8a7fcf37a90b044c4ce5093a81430 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ddbe6ca86b8a7fcf37a90b044c4ce5093a81430 commit 2ddbe6ca86b8a7fcf37a90b044c4ce5093a81430 Author: Jan Beich AuthorDate: 2023-06-30 13:30:05 +0000 Commit: Jan Beich CommitDate: 2023-06-30 21:32:58 +0000 graphics/vulkan-headers: update to 1.3.256 Force rebuild vulkan-loader to make sure vulkaninfo shows the new version. Changes: https://github.com/KhronosGroup/Vulkan-Headers/compare/v1.3.255...v1.3.256 Reported by: Repology, portscout --- .../files/patch-lib_ivis__opengl_gfx__api__vk.cpp | 67 ++++++++++++++++++++++ graphics/vulkan-headers/Makefile | 2 +- graphics/vulkan-headers/distinfo | 6 +- graphics/vulkan-headers/pkg-plist | 1 + graphics/vulkan-loader/Makefile | 1 + graphics/vulkan-tools/Makefile | 5 ++ graphics/vulkan-tools/distinfo | 2 + 7 files changed, 80 insertions(+), 4 deletions(-) diff --git a/games/warzone2100/files/patch-lib_ivis__opengl_gfx__api__vk.cpp b/games/warzone2100/files/patch-lib_ivis__opengl_gfx__api__vk.cpp new file mode 100644 index 000000000000..66c1fc070497 --- /dev/null +++ b/games/warzone2100/files/patch-lib_ivis__opengl_gfx__api__vk.cpp @@ -0,0 +1,67 @@ +lib/ivis_opengl/gfx_api_vk.cpp:524:3: error: no member named 'throwResultException' in namespace 'vk'; did you mean 'vk::detail::throwResultException'? + vk::throwResultException( result, "vmaCreateBuffer" ); + ^~~~~~~~~~~~~~~~~~~~~~~~ + vk::detail::throwResultException +/usr/local/include/vulkan/vulkan.hpp:6639:41: note: 'vk::detail::throwResultException' declared here + [[noreturn]] VULKAN_HPP_INLINE void throwResultException( Result result, char const * message ) + ^ +lib/ivis_opengl/gfx_api_vk.cpp:1543:4: error: no member named 'throwResultException' in namespace 'vk'; did you mean 'vk::detail::throwResultException'? + vk::throwResultException(result.result, "createGraphicsPipeline"); + ^~~~~~~~~~~~~~~~~~~~~~~~ + vk::detail::throwResultException +/usr/local/include/vulkan/vulkan.hpp:6639:41: note: 'vk::detail::throwResultException' declared here + [[noreturn]] VULKAN_HPP_INLINE void throwResultException( Result result, char const * message ) + ^ +lib/ivis_opengl/gfx_api_vk.cpp:1607:3: error: no member named 'throwResultException' in namespace 'vk'; did you mean 'vk::detail::throwResultException'? + vk::throwResultException( result, "vmaCreateBuffer" ); + ^~~~~~~~~~~~~~~~~~~~~~~~ + vk::detail::throwResultException +/usr/local/include/vulkan/vulkan.hpp:6639:41: note: 'vk::detail::throwResultException' declared here + [[noreturn]] VULKAN_HPP_INLINE void throwResultException( Result result, char const * message ) + ^ +lib/ivis_opengl/gfx_api_vk.cpp:1740:3: error: no member named 'throwResultException' in namespace 'vk'; did you mean 'vk::detail::throwResultException'? + vk::throwResultException( result, "vmaCreateImage" ); + ^~~~~~~~~~~~~~~~~~~~~~~~ + vk::detail::throwResultException +/usr/local/include/vulkan/vulkan.hpp:6639:41: note: 'vk::detail::throwResultException' declared here + [[noreturn]] VULKAN_HPP_INLINE void throwResultException( Result result, char const * message ) + ^ + +--- lib/ivis_opengl/gfx_api_vk.cpp.orig 2023-04-16 17:42:55 UTC ++++ lib/ivis_opengl/gfx_api_vk.cpp +@@ -521,7 +521,7 @@ void BlockBufferAllocator::allocateNewBlock(uint32_t m + if (result != vk::Result::eSuccess) + { + // Failed to allocate memory! +- vk::throwResultException( result, "vmaCreateBuffer" ); ++ vk::detail::throwResultException( result, "vmaCreateBuffer" ); + } + + if (autoMap) +@@ -1540,7 +1540,7 @@ VkPSO::VkPSO(vk::Device _dev, + object = std::move(result.value); + break; + default: +- vk::throwResultException(result.result, "createGraphicsPipeline"); ++ vk::detail::throwResultException(result.result, "createGraphicsPipeline"); + } + } + +@@ -1604,7 +1604,7 @@ void VkBuf::allocateBufferObject(const std::size_t& si + if (result != vk::Result::eSuccess) + { + // Failed to allocate memory! +- vk::throwResultException( result, "vmaCreateBuffer" ); ++ vk::detail::throwResultException( result, "vmaCreateBuffer" ); + } + + buffer_size = size; +@@ -1737,7 +1737,7 @@ VkTexture::VkTexture(const VkRoot& root, const std::si + if (result != vk::Result::eSuccess) + { + // Failed to allocate memory! +- vk::throwResultException( result, "vmaCreateImage" ); ++ vk::detail::throwResultException( result, "vmaCreateImage" ); + } + + if (root.debugUtilsExtEnabled) diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index d2da1f61bb17..193b7a83b726 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,6 +1,6 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.3.255 +DISTVERSION= 1.3.256 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo index b617d109d3c4..a7cb984c6af6 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687522754 -SHA256 (KhronosGroup-Vulkan-Headers-v1.3.255_GH0.tar.gz) = 8e1db7041ad6dbaf4f3326a297b4aee17f3178a0d1cf9cd76a3f934c855357b5 -SIZE (KhronosGroup-Vulkan-Headers-v1.3.255_GH0.tar.gz) = 1934452 +TIMESTAMP = 1688131805 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.256_GH0.tar.gz) = fcd3021d5f504941aa285836125fc61e6b0636bb61da6f33d9ae9299786f729b +SIZE (KhronosGroup-Vulkan-Headers-v1.3.256_GH0.tar.gz) = 1954053 diff --git a/graphics/vulkan-headers/pkg-plist b/graphics/vulkan-headers/pkg-plist index a3f781a434cc..0d1fe883eb64 100644 --- a/graphics/vulkan-headers/pkg-plist +++ b/graphics/vulkan-headers/pkg-plist @@ -8,6 +8,7 @@ include/vk_video/vulkan_video_codecs_common.h include/vulkan/vk_icd.h include/vulkan/vk_layer.h include/vulkan/vk_platform.h +include/vulkan/vulkan.cppm include/vulkan/vulkan.h include/vulkan/vulkan.hpp include/vulkan/vulkan_android.h diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 7d9c2d29d497..00acd9575d19 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,6 +1,7 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v DISTVERSION= 1.3.255 +PORTREVISION= 1 CATEGORIES= graphics devel MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile index 6e0a75004d19..c9c6ffd4726b 100644 --- a/graphics/vulkan-tools/Makefile +++ b/graphics/vulkan-tools/Makefile @@ -20,6 +20,11 @@ GH_PROJECT= Vulkan-Tools CMAKE_OFF= BUILD_CUBE BUILD_ICD CMAKE_ARGS= -DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}" +.if ${DISTVERSION:E} < 256 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.255:vkheaders/Vulkan-Headers +CFLAGS+= -I${WRKSRC_vkheaders}/include +.endif + OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT= WAYLAND XCB XLIB OPTIONS_SLAVE= DISPLAY diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo index 095e4db6b05e..ca15d22ea719 100644 --- a/graphics/vulkan-tools/distinfo +++ b/graphics/vulkan-tools/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1687555001 SHA256 (KhronosGroup-Vulkan-Tools-v1.3.255_GH0.tar.gz) = ccd9175eec671b9ebff2486d1fb3e3d2f318028bbc873378ff9e1382b432abc6 SIZE (KhronosGroup-Vulkan-Tools-v1.3.255_GH0.tar.gz) = 788501 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.255_GH0.tar.gz) = 8e1db7041ad6dbaf4f3326a297b4aee17f3178a0d1cf9cd76a3f934c855357b5 +SIZE (KhronosGroup-Vulkan-Headers-v1.3.255_GH0.tar.gz) = 1934452