From nobody Mon Sep 18 07:17:29 2023 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 4Rpx2K4dWvz4tgJK; Mon, 18 Sep 2023 07:17:29 +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 4Rpx2K46Rcz3CHk; Mon, 18 Sep 2023 07:17:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695021449; 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=fwv8WhRu/J1soOCv7HsP52VOqVOZZeOaEsCw9z5RsZo=; b=vRmoc0Etns9nO30tDaIVFUYrwHS+MoJmMtl4LaMW0xLBWEKaJCU8uN+VA5Bo0AKVqoDP1h fitI2j60CD9Yv2pYUNfxhLKC/usZA+DG9o7uP1rYmqkFF0mDYW0E0Zhy8we/J+xF7RIXxe cSCdIFMw6d3rP8W76J1/0Jp5dCD3ZHh78eHwLw2GGw7NEF0MVgqh2Ie55HunjyISdY2/DW JkUVkTMuSrztQ3D34HbzzMT4tJOpykg1YbmwoAHQoPzYYuBQhf85IREG390rrmLC4bfLEB v2lfdmDtebqyEenb3LbuVt+hYxMzYO7a3Rh2M+/PvwKVwudxJaxe25Z+nipiIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695021449; a=rsa-sha256; cv=none; b=qrTv/aTU2MM5TwxVFut6275v2mNl1y68MMgrlcLg+B73ldNtvr8Mi6fffhbUej+6S8xwe9 2Sr0dCreeoDRqFE+EiWBG7btaMEceuCu4rDvtOb9bbS8OhtksKNqn1Wtcsr05Hl3XlTUT2 9kUKF7ik7ryb2xUILTF1IK+YAZD96SkoRz1ZyEYGMlHwRMvzmCueep2LPv5JItWlbfIma5 bQGwFuR3IxdW1ICrw2cVIRZSJ6wCf2jfqO1I7puWjIiQcVq7VLQ1XVgrbgxcIC6uM8IrdA SjLR+0Z+XChTH2fbSexP4HxsTOsVtla+EDN6uZ0IOinzMaxFAnm1UdFGCH9MfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695021449; 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=fwv8WhRu/J1soOCv7HsP52VOqVOZZeOaEsCw9z5RsZo=; b=GOVxyrj8KGCTwuxdqDFu2VOl2mbZ/dUZNjZ7sydbstjxRE1q4AaJNXZIG3Vg4kjp21lug1 C7sWFqvI0DBF7L8Ieo+ohFcV3bogyjc16QMNWng+Ori6FeUyPIA/9tSzdV4tm9QRtNKdic OI5Kvlrexa1OUYrDneDkNrnFSNoA1Jw7Qmmo01uN7HQW25W2Uhji5dnTobMUCGxPIm30+2 /oPvwcsM00sgbYc+AwxJOMcaCjGbgP8nnJVWCi0Z6fM1WzYILWCZHj958yBpyWyuk7Nev3 cnJWP/zVFqfL1NqkU+ClmN/Vx82KjgeM/4aIsDGHpmdKY8ET2jAjt7zbrT+hJQ== 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 4Rpx2K38XJz6wJ; Mon, 18 Sep 2023 07:17:29 +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 38I7HT5x081931; Mon, 18 Sep 2023 07:17:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38I7HT0c081928; Mon, 18 Sep 2023 07:17:29 GMT (envelope-from git) Date: Mon, 18 Sep 2023 07:17:29 GMT Message-Id: <202309180717.38I7HT0c081928@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: bee4aa6a98e9 - main - games/0ad: Fix build with newer libfmt 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bee4aa6a98e9d2aa673af6ec0606f88c65fd52ea Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=bee4aa6a98e9d2aa673af6ec0606f88c65fd52ea commit bee4aa6a98e9d2aa673af6ec0606f88c65fd52ea Author: Guido Falsi AuthorDate: 2023-09-18 07:16:49 +0000 Commit: Guido Falsi CommitDate: 2023-09-18 07:16:49 +0000 games/0ad: Fix build with newer libfmt Import upstream patch to fix building with upcoming libfmt update. While here, remove some unneeded dependencies. PR: 273873 Obtained from: https://trac.wildfiregames.com/changeset/27657 --- games/0ad/Makefile | 16 +++++++--------- games/0ad/files/patch-source_network_NetMessage.cpp | 18 ++++++++++++++++++ ...urce_simulation2_serialization_BinarySerializer.cpp | 11 +++++++++++ 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/games/0ad/Makefile b/games/0ad/Makefile index da16454a9af2..055246833ffb 100644 --- a/games/0ad/Makefile +++ b/games/0ad/Makefile @@ -1,6 +1,6 @@ PORTNAME= 0ad PORTVERSION= 0.0.26 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= games MASTER_SITES= http://releases.wildfiregames.com/ \ SF/zero-ad/releases @@ -19,22 +19,20 @@ BROKEN_powerpc64= fails to compile: _psutil_bsd.c: error: 'struct xtcpcb' has no BUILD_DEPENDS= ${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \ zip:archivers/zip \ cmake:devel/cmake-core -LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ +LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ libicui18n.so:devel/icu \ - libpng.so:graphics/png \ - libogg.so:audio/libogg \ - libvorbis.so:audio/libvorbis \ + libpng16.so:graphics/png \ + libvorbisfile.so:audio/libvorbis \ libcurl.so:ftp/curl \ + libfreetype.so:print/freetype2 \ libgloox.so:net-im/gloox \ libminiupnpc.so:net/miniupnpc \ - libnspr4.so:devel/nspr \ libenet.so:net/enet \ - libtiff.so:graphics/tiff \ libsodium.so:security/libsodium \ libfmt.so:devel/libfmt -USES= compiler:c++11-lib desktop-file-utils dos2unix gl gmake gnome \ - iconv jpeg openal:al perl5 pkgconfig python:build sdl tar:xz \ +USES= compiler:c++11-lib desktop-file-utils dos2unix gmake gnome \ + iconv openal:al perl5 pkgconfig python:build sdl tar:xz \ xorg USE_GNOME= libxml2 USE_GL= gl diff --git a/games/0ad/files/patch-source_network_NetMessage.cpp b/games/0ad/files/patch-source_network_NetMessage.cpp new file mode 100644 index 000000000000..f8722186a922 --- /dev/null +++ b/games/0ad/files/patch-source_network_NetMessage.cpp @@ -0,0 +1,18 @@ +--- source/network/NetMessage.cpp.orig 2023-09-17 08:35:54 UTC ++++ source/network/NetMessage.cpp +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2017 Wildfire Games. ++/* Copyright (C) 2023 Wildfire Games. + * This file is part of 0 A.D. + * + * 0 A.D. is free software: you can redistribute it and/or modify +@@ -216,7 +216,8 @@ CNetMessage* CNetMessageFactory::CreateMessage(const v + break; + + default: +- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType()); ++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", ++ static_cast(header.GetType())); + break; + } + diff --git a/games/0ad/files/patch-source_simulation2_serialization_BinarySerializer.cpp b/games/0ad/files/patch-source_simulation2_serialization_BinarySerializer.cpp new file mode 100644 index 000000000000..c1c94a1d1e1e --- /dev/null +++ b/games/0ad/files/patch-source_simulation2_serialization_BinarySerializer.cpp @@ -0,0 +1,11 @@ +--- source/simulation2/serialization/BinarySerializer.cpp.orig 2022-08-21 12:45:40 UTC ++++ source/simulation2/serialization/BinarySerializer.cpp +@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType) + case js::Scalar::Uint8Clamped: + return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED; + default: +- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType); ++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast(arrayType)); + throw PSERROR_Serialize_InvalidScriptValue(); + } + }