From nobody Tue Jan 11 16:52:53 2022 X-Original-To: dev-commits-ports-all@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 5D9D619402D0; Tue, 11 Jan 2022 16:52:54 +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 4JYGw60Zspz3hkp; Tue, 11 Jan 2022 16:52:54 +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 E9AF81C948; Tue, 11 Jan 2022 16:52:53 +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 20BGqrii092054; Tue, 11 Jan 2022 16:52:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BGqrpW092053; Tue, 11 Jan 2022 16:52:53 GMT (envelope-from git) Date: Tue, 11 Jan 2022 16:52:53 GMT Message-Id: <202201111652.20BGqrpW092053@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 6d4836a4f340 - main - games/warzone2100: fix upstream patch handling List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d4836a4f3407ff32cf97fa85a5bb68327052a8e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641919974; 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=T9YNkONeN2RBNSBhmgSDK8dOSYz6WFwTHAjwWnl9Gos=; b=qH6qy3SMhCvxuIvUjnCx1Ww9ensISg/GMry2VUcBK3IikZKJU63DClmELkuojskeJckzNv EA6lAU/dN/mk9de+m9lAYgr5wHWQHyJoxTJawsL8IN2JLnrjVa/NFgXzB+IQWHVp/vySk5 8s5oRv/VFSXZ1yiPbodmEpexBu68FHIyZfJvLZQELqD09HrnVrKwuDcfdpgzFFlvQrrikY KoCb/x8HW2RX2ol/yTa+dTbjs5F6LKv44mAaNtJNh6wee2Nnbk7v9CfIxFf4yqnRfD03KM WIkLBh9LwK+EeDqjdlfOynQq976q+EiI2CDIzsCTo0WFQP5njvCsjBAkM6XMww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641919974; a=rsa-sha256; cv=none; b=iMucaDxqb699gvn+VxGqHnkFoLBmrb3Vfl5Wk+uRpe8yGZlZIt6DiunJJEbJox3nmQQf8S iCvAWY1tH53i9dCrTTtVI86EnrEG1+e4h/G3cdC8XmHQmSV96tuAxDfWLcLtGGO3rSa617 Yz0v8vZ74JCHAamTBVfpMnWOVto4D3p0EM3fPMkjniI7/T32BB8sUS9nu5l0j4L/0KAcze 91/do/6c62V9Qd2RiiShQUdZ9AI2akcwhnGB3C6vaURuju+Th6tPsZuUwv7/nJq2XueykU lMLjAeLRjK53kjSRylF3JnBT5HhWfJX5EfTiO+6rBAhReRgPbiYQ66T+74n+sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=6d4836a4f3407ff32cf97fa85a5bb68327052a8e commit 6d4836a4f3407ff32cf97fa85a5bb68327052a8e Author: Dmitry Marakasov AuthorDate: 2021-12-29 19:30:24 +0000 Commit: Dmitry Marakasov CommitDate: 2022-01-11 16:50:06 +0000 games/warzone2100: fix upstream patch handling Instead of using PATCHFILES, handle backported upstream commit as a patch under files/, where it is always available, manageable and where it doesn't break when patch format changes. Pointyhat to: jbeich --- games/warzone2100/Makefile | 3 --- games/warzone2100/distinfo | 2 -- games/warzone2100/files/patch-5e6fdab | 49 +++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 5 deletions(-) diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index a21f4cccc585..c3b1e1026a28 100644 --- a/games/warzone2100/Makefile +++ b/games/warzone2100/Makefile @@ -6,9 +6,6 @@ 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 0911f8249158..ea2ee87491e0 100644 --- a/games/warzone2100/distinfo +++ b/games/warzone2100/distinfo @@ -1,5 +1,3 @@ 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-5e6fdab b/games/warzone2100/files/patch-5e6fdab new file mode 100644 index 000000000000..4b9e4fb8ed99 --- /dev/null +++ b/games/warzone2100/files/patch-5e6fdab @@ -0,0 +1,49 @@ +From 5e6fdab3feac55357bcaedcb03ef619d23d3277f Mon Sep 17 00:00:00 2001 +From: past-due <30942300+past-due@users.noreply.github.com> +Date: Sat, 4 Dec 2021 11:22:24 -0500 +Subject: [PATCH] [Vulkan] Add missing vk:: namespace to `throwResultException` + +--- + lib/ivis_opengl/gfx_api_vk.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/lib/ivis_opengl/gfx_api_vk.cpp b/lib/ivis_opengl/gfx_api_vk.cpp +index 594d127f70..419b8a7644 100644 +--- lib/ivis_opengl/gfx_api_vk.cpp ++++ lib/ivis_opengl/gfx_api_vk.cpp +@@ -477,7 +477,7 @@ void BlockBufferAllocator::allocateNewBlock(uint32_t minimumSize) + if (result != vk::Result::eSuccess) + { + // Failed to allocate memory! +- throwResultException( result, "vmaCreateBuffer" ); ++ vk::throwResultException( result, "vmaCreateBuffer" ); + } + + if (autoMap) +@@ -1304,7 +1304,7 @@ VkPSO::VkPSO(vk::Device _dev, + object = std::move(result.value); + break; + default: +- throwResultException(result.result, "createGraphicsPipeline"); ++ vk::throwResultException(result.result, "createGraphicsPipeline"); + } + } + +@@ -1368,7 +1368,7 @@ void VkBuf::allocateBufferObject(const std::size_t& size) + if (result != vk::Result::eSuccess) + { + // Failed to allocate memory! +- throwResultException( result, "vmaCreateBuffer" ); ++ vk::throwResultException( result, "vmaCreateBuffer" ); + } + + buffer_size = size; +@@ -1486,7 +1486,7 @@ VkTexture::VkTexture(const VkRoot& root, const std::size_t& mipmap_count, const + if (result != vk::Result::eSuccess) + { + // Failed to allocate memory! +- throwResultException( result, "vmaCreateImage" ); ++ vk::throwResultException( result, "vmaCreateImage" ); + } + + const auto imageViewCreateInfo = vk::ImageViewCreateInfo()