From nobody Thu Mar 03 19:36:24 2022 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 48E4D19E03BC; Thu, 3 Mar 2022 19:36:25 +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 4K8h7F1X9Lz3D5Q; Thu, 3 Mar 2022 19:36:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646336185; 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=jQwTyRzT7ItD05GS7iet/ljlm5JE/4tZtMpUOlI8x8E=; b=Llvn9E8WwZPo0oFc947pWk0glMvsoZcIloVPTgaxsdTrum+epucU+wJkJTbvhGMnx0AKTL kql6LJdPBxCcLFj/XhwdN8XfygXDXIWFlswKjcg5mPYukW0dnTz8DFqIsq+h5dKPWkp+5E nXdhXnBRGfoX1k30xaxzsZrwqxWVXPTS7OMEwLEN+622BbWnD04WQLUZrNCmBNQ7Qial9V 7X8JTKCtF3+fJByS7kmYAbXJaWhenyQSNoWoUrEQogirAog/t59Xeow+sh1W9qxR2hVQsF IWEzp4q0nilIS4Kq5W7zQPuQJGcWAogHcT+WwjGiJHn0HTZXFkCnUKD4mQaUsw== 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 140F81DE09; Thu, 3 Mar 2022 19:36:25 +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 223JaO86018465; Thu, 3 Mar 2022 19:36:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 223JaOAq018464; Thu, 3 Mar 2022 19:36:24 GMT (envelope-from git) Date: Thu, 3 Mar 2022 19:36:24 GMT Message-Id: <202203031936.223JaOAq018464@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: 6979dc04a30c - main - =?utf-8?Q?games/warzone2100: update 4.0.1 =E2=86=92 4.2.6?= 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6979dc04a30ce74e1f02c44c3c1a3ca2eaf3f124 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646336185; 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=jQwTyRzT7ItD05GS7iet/ljlm5JE/4tZtMpUOlI8x8E=; b=T7wrxLU07+Zw3KHz0unl5i+hWay6gRe7Spim7iTbI0VdWW8ha/fg5UnwiQz8S2DfluIOMZ S++I2HI55s7YO+YTbnVoU3QYTTpZAq7GkVNu0mmCRo4kufVkxMUXwESzJD8MObyPmgKIlE MaXNTb4hMztwB5glIfFeQTxJPiUfaT2MiJSI0xGuu/xx4vd3pd2Muf98IN+cKxrT9aCXA/ aI6iqVqYRmKtQoa14Gjl3VCJPlk8eSqzkmwsqsneATN1RcmnKAb9BN+Kdqb1G2sD2GUvMD JA5uuWa7vEN9G4873VY8P46xaRNaNzea0XnkBLCP/6izPpF/vzGF1pgHHdrH/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646336185; a=rsa-sha256; cv=none; b=cZIQMr69vhuOJR32LIPE6P/jN7JyZrhz4hMhxDm2t6Otw1B1XARDhlvVBh0qkHfRqVHUvE 3t4ym+oZ1QQkhk6AMn4D0BXyYJlTwuxQ60bgE3dfYnm1PicJsu71uXtcKVlrF35UbO+yDz EEYw78GyQxYRgquNL3lJ8/xwcV27gFta+1GWwY8dZuxRf57sXhXSr6IEOiDz2gw9Jys5VL RAZJuwwNPQwLFdUPizgZV4g4HWmts4PcGAr5EvQtgCcY3+LDzQJCnmKZBXwWZW1Ruizsij zj6T67Zv+JyKx+rdaJY7fHbXfIoJ5YmM/oIH161gFal3U9Gv+FUBlt2QZv0fZg== 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=6979dc04a30ce74e1f02c44c3c1a3ca2eaf3f124 commit 6979dc04a30ce74e1f02c44c3c1a3ca2eaf3f124 Author: Dmitry Marakasov AuthorDate: 2021-07-13 14:16:56 +0000 Commit: Dmitry Marakasov CommitDate: 2022-03-03 19:35:38 +0000 games/warzone2100: update 4.0.1 → 4.2.6 --- games/warzone2100/Makefile | 3 +- games/warzone2100/distinfo | 6 +-- games/warzone2100/files/patch-5e6fdab | 49 ------------------------ games/warzone2100/files/patch-src_CMakeLists.txt | 12 ++++++ games/warzone2100/pkg-plist | 3 ++ 5 files changed, 19 insertions(+), 54 deletions(-) diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index 2b189d8791b9..ee6836b4a118 100644 --- a/games/warzone2100/Makefile +++ b/games/warzone2100/Makefile @@ -1,6 +1,5 @@ PORTNAME= warzone2100 -PORTVERSION= 4.0.1 -PORTREVISION= 1 +PORTVERSION= 4.2.6 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/releases/${PORTVERSION}/ DISTNAME= ${PORTNAME}_src diff --git a/games/warzone2100/distinfo b/games/warzone2100/distinfo index ea2ee87491e0..c28f363efa50 100644 --- a/games/warzone2100/distinfo +++ b/games/warzone2100/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618939913 -SHA256 (warzone2100-4.0.1/warzone2100_src.tar.xz) = 337622d5f813bbc1f9a3b4fee0874fcc074806781cfa9c25a252534ddd240ab9 -SIZE (warzone2100-4.0.1/warzone2100_src.tar.xz) = 337713608 +TIMESTAMP = 1646312222 +SHA256 (warzone2100-4.2.6/warzone2100_src.tar.xz) = b1d1dcfe2d5f7db4c063b7a13ba2ec21afa597e2c792e5c8c1cc13204398dbc8 +SIZE (warzone2100-4.2.6/warzone2100_src.tar.xz) = 338691628 diff --git a/games/warzone2100/files/patch-5e6fdab b/games/warzone2100/files/patch-5e6fdab deleted file mode 100644 index 4b9e4fb8ed99..000000000000 --- a/games/warzone2100/files/patch-5e6fdab +++ /dev/null @@ -1,49 +0,0 @@ -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() diff --git a/games/warzone2100/files/patch-src_CMakeLists.txt b/games/warzone2100/files/patch-src_CMakeLists.txt new file mode 100644 index 000000000000..6b218103529a --- /dev/null +++ b/games/warzone2100/files/patch-src_CMakeLists.txt @@ -0,0 +1,12 @@ +--- src/CMakeLists.txt.orig 2021-07-12 15:03:29 UTC ++++ src/CMakeLists.txt +@@ -611,9 +611,6 @@ endif() + # Install + install(TARGETS warzone2100 COMPONENT Core DESTINATION "${WZ_APP_INSTALL_DEST}") + +-# For Portable packages only, copy the ".portable" file that triggers portable mode (Windows-only) +-install(FILES "${CMAKE_SOURCE_DIR}/pkg/portable.in" COMPONENT PortableConfig DESTINATION "${WZ_APP_INSTALL_DEST}" RENAME ".portable") +- + ##################### + # Installing Required Runtime Dependencies + diff --git a/games/warzone2100/pkg-plist b/games/warzone2100/pkg-plist index 281bd7978d5d..3a9a0b1aa27a 100644 --- a/games/warzone2100/pkg-plist +++ b/games/warzone2100/pkg-plist @@ -3,6 +3,7 @@ man/man6/warzone2100.6.gz share/applications/warzone2100.desktop share/icons/warzone2100.png %%NLS%%share/locale/af_ZA/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/ar_SA/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/bg_BG/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/ca_ES/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/cs/LC_MESSAGES/warzone2100.mo @@ -13,6 +14,7 @@ share/icons/warzone2100.png %%NLS%%share/locale/eo/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/es/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/et_EE/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/fa_IR/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/fi/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/fr/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/fy/LC_MESSAGES/warzone2100.mo @@ -26,6 +28,7 @@ share/icons/warzone2100.png %%NLS%%share/locale/ko/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/la/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/lt/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/my_MM/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/nb/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/nl/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/pl/LC_MESSAGES/warzone2100.mo