From nobody Mon Dec 13 12:27:55 2021 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 4D80518EA659; Mon, 13 Dec 2021 12:27:56 +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 4JCLPm05myz4kqY; Mon, 13 Dec 2021 12:27:56 +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 D790514772; Mon, 13 Dec 2021 12:27:55 +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 1BDCRtEi021024; Mon, 13 Dec 2021 12:27:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BDCRtbb021023; Mon, 13 Dec 2021 12:27:55 GMT (envelope-from git) Date: Mon, 13 Dec 2021 12:27:55 GMT Message-Id: <202112131227.1BDCRtbb021023@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: 5c5b6e94234f - main - games/warzone2100: replace vk::throwResultException fix with upstream 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: 5c5b6e94234f1d3e4b8ac29e05934d1e30da3893 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639398476; 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=+caqq/chybUMiSdlbPBB7PT1VL1JrYh18CXWhSUnwlw=; b=qtGgBTXQoC1EvHrr989jag/2tsKD7YXPSaz+zJ6KvWQkMK3tALn5FLQPzGoWJS3JbHuTNZ QgGHot9ZUF9EcuXDPmN4m1zRGXwzEViVY09Jg5VLWuJ0mXxLyDQgQ0t+herouaG7RNrN1t Yo7QUoiM3sGZUVOZgQjNGlc/AsbYJSZVTx3hitWKBfbx0LsFM4rrxCSW9wr12OhC00FnI5 bwE9cugxivtYzEFulMWjMyxOVj6q1JZ3M8igeoso4PURSaX1BdLyG7RjRizn9miEdtN1vG EjPJ0nLrf1uShGDliHHO/lzI7Uc6iQimlGJL/lCggwf34R4ogDvsc1zcj+DoeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639398476; a=rsa-sha256; cv=none; b=M9NqzpMxSRDglukwS3rDAz94nA+oWcwcQSTIFztxRZcR42S+rbtKUIvR2Gj14LqDUHTmK+ 3JV0XYr/F+B1FY7f3DEwfkdNhY2rw4OpBWMf129C28E6pcCmB+KogqTQjC5nl3cTbq1q4p GceY6H30pokVBnmDHNiVo//ZJW+foZ8C5mZmXRZ5NE3TCEVgXvON3fEZ/GMxpIuOB1/P2/ rjyb5TCc/3EBra6peqj10435310JoMr0LDNlyvdpWFrFm7bfPQNtzqCAmyQjryt1HEWjJM XZ4GMMA9eoDCy9SK964oKJ5w/G/9oZvqkzN0oH/0Apv0OGC63WXyDNw21uuwlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=5c5b6e94234f1d3e4b8ac29e05934d1e30da3893 commit 5c5b6e94234f1d3e4b8ac29e05934d1e30da3893 Author: Jan Beich AuthorDate: 2021-12-13 12:24:36 +0000 Commit: Jan Beich CommitDate: 2021-12-13 12:27:46 +0000 games/warzone2100: replace vk::throwResultException fix with upstream --- games/warzone2100/Makefile | 3 + games/warzone2100/distinfo | 2 + .../warzone2100/files/patch-vulkan-headers-1.2.197 | 67 ---------------------- 3 files changed, 5 insertions(+), 67 deletions(-) diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index c3b1e1026a28..a21f4cccc585 100644 --- a/games/warzone2100/Makefile +++ b/games/warzone2100/Makefile @@ -6,6 +6,9 @@ MASTER_SITES= SF/${PORTNAME}/releases/${PORTVERSION}/ DISTNAME= ${PORTNAME}_src DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} +PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME}/commit/ +PATCHFILES+= 5e6fdab3feac.patch:-p1 # https://github.com/Warzone2100/warzone2100/pull/2479 + MAINTAINER= amdmi3@FreeBSD.org COMMENT= Innovative 3D real-time strategy game diff --git a/games/warzone2100/distinfo b/games/warzone2100/distinfo index ea2ee87491e0..0911f8249158 100644 --- a/games/warzone2100/distinfo +++ b/games/warzone2100/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1618939913 SHA256 (warzone2100-4.0.1/warzone2100_src.tar.xz) = 337622d5f813bbc1f9a3b4fee0874fcc074806781cfa9c25a252534ddd240ab9 SIZE (warzone2100-4.0.1/warzone2100_src.tar.xz) = 337713608 +SHA256 (warzone2100-4.0.1/5e6fdab3feac.patch) = 579ffd85c09ffca615a9c90cb07d1021d7dc58fe12dffed8c7e5602cdaa8ca7d +SIZE (warzone2100-4.0.1/5e6fdab3feac.patch) = 1737 diff --git a/games/warzone2100/files/patch-vulkan-headers-1.2.197 b/games/warzone2100/files/patch-vulkan-headers-1.2.197 deleted file mode 100644 index 700428327986..000000000000 --- a/games/warzone2100/files/patch-vulkan-headers-1.2.197 +++ /dev/null @@ -1,67 +0,0 @@ -lib/ivis_opengl/gfx_api_vk.cpp:480:3: error: use of undeclared identifier 'throwResultException'; did you mean 'vk::throwResultException'? - throwResultException( result, "vmaCreateBuffer" ); - ^~~~~~~~~~~~~~~~~~~~ - vk::throwResultException -/usr/local/include/vulkan/vulkan.hpp:6315:23: note: 'vk::throwResultException' declared here - [[noreturn]] void throwResultException( Result result, char const * message ) - ^ -lib/ivis_opengl/gfx_api_vk.cpp:1293:4: error: use of undeclared identifier 'throwResultException'; did you mean 'vk::throwResultException'? - throwResultException(result.result, "createGraphicsPipeline"); - ^~~~~~~~~~~~~~~~~~~~ - vk::throwResultException -/usr/local/include/vulkan/vulkan.hpp:6315:23: note: 'vk::throwResultException' declared here - [[noreturn]] void throwResultException( Result result, char const * message ) - ^ -lib/ivis_opengl/gfx_api_vk.cpp:1353:3: error: use of undeclared identifier 'throwResultException'; did you mean 'vk::throwResultException'? - throwResultException( result, "vmaCreateBuffer" ); - ^~~~~~~~~~~~~~~~~~~~ - vk::throwResultException -/usr/local/include/vulkan/vulkan.hpp:6315:23: note: 'vk::throwResultException' declared here - [[noreturn]] void throwResultException( Result result, char const * message ) - ^ -lib/ivis_opengl/gfx_api_vk.cpp:1460:3: error: use of undeclared identifier 'throwResultException'; did you mean 'vk::throwResultException'? - throwResultException( result, "vmaCreateImage" ); - ^~~~~~~~~~~~~~~~~~~~ - vk::throwResultException -/usr/local/include/vulkan/vulkan.hpp:6315:23: note: 'vk::throwResultException' declared here - [[noreturn]] void throwResultException( Result result, char const * message ) - ^ - ---- lib/ivis_opengl/gfx_api_vk.cpp.orig 2021-04-18 18:28:41 UTC -+++ lib/ivis_opengl/gfx_api_vk.cpp -@@ -477,7 +477,7 @@ void BlockBufferAllocator::allocateNewBlock(uint32_t m - if (result != vk::Result::eSuccess) - { - // Failed to allocate memory! -- throwResultException( result, "vmaCreateBuffer" ); -+ vk::throwResultException( result, "vmaCreateBuffer" ); - } - - if (autoMap) -@@ -1290,7 +1290,7 @@ VkPSO::VkPSO(vk::Device _dev, - object = std::move(result.value); - break; - default: -- throwResultException(result.result, "createGraphicsPipeline"); -+ vk::throwResultException(result.result, "createGraphicsPipeline"); - } - } - -@@ -1350,7 +1350,7 @@ void VkBuf::allocateBufferObject(const std::size_t& si - if (result != vk::Result::eSuccess) - { - // Failed to allocate memory! -- throwResultException( result, "vmaCreateBuffer" ); -+ vk::throwResultException( result, "vmaCreateBuffer" ); - } - - buffer_size = size; -@@ -1457,7 +1457,7 @@ VkTexture::VkTexture(const VkRoot& root, const std::si - if (result != vk::Result::eSuccess) - { - // Failed to allocate memory! -- throwResultException( result, "vmaCreateImage" ); -+ vk::throwResultException( result, "vmaCreateImage" ); - } - - const auto imageViewCreateInfo = vk::ImageViewCreateInfo()