sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

games/0ad: Fix build with newer libfmt

Browse source 
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
This commit is contained in:
Guido Falsi 2023-09-18 09:16:49 +02:00
parent 6782e4a1dd
commit bee4aa6a98
3 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
games/0ad/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= 0ad PORTNAME= 0ad
PORTVERSION= 0.0.26 PORTVERSION= 0.0.26
PORTREVISION= 14 PORTREVISION= 15
CATEGORIES= games CATEGORIES= games
MASTER_SITES= http://releases.wildfiregames.com/ \ MASTER_SITES= http://releases.wildfiregames.com/ \
SF/zero-ad/releases 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} \ BUILD_DEPENDS= ${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \
zip:archivers/zip \ zip:archivers/zip \
cmake:devel/cmake-core cmake:devel/cmake-core
LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \
libicui18n.so:devel/icu \ libicui18n.so:devel/icu \
libpng.so:graphics/png \ libpng16.so:graphics/png \
libogg.so:audio/libogg \ libvorbisfile.so:audio/libvorbis \
libvorbis.so:audio/libvorbis \
libcurl.so:ftp/curl \ libcurl.so:ftp/curl \
libfreetype.so:print/freetype2 \
libgloox.so:net-im/gloox \ libgloox.so:net-im/gloox \
libminiupnpc.so:net/miniupnpc \ libminiupnpc.so:net/miniupnpc \
libnspr4.so:devel/nspr \
libenet.so:net/enet \ libenet.so:net/enet \
libtiff.so:graphics/tiff \
libsodium.so:security/libsodium \ libsodium.so:security/libsodium \
libfmt.so:devel/libfmt libfmt.so:devel/libfmt
USES= compiler:c++11-lib desktop-file-utils dos2unix gl gmake gnome \ USES= compiler:c++11-lib desktop-file-utils dos2unix gmake gnome \
iconv jpeg openal:al perl5 pkgconfig python:build sdl tar:xz \ iconv openal:al perl5 pkgconfig python:build sdl tar:xz \
xorg xorg
USE_GNOME= libxml2 USE_GNOME= libxml2
USE_GL= gl USE_GL= gl

18
games/0ad/files/patch-source_network_NetMessage.cpp Normal file
View file

@ -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<int>(header.GetType()));
break;
}

11
games/0ad/files/patch-source_simulation2_serialization_BinarySerializer.cpp Normal file
View file

@ -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<int>(arrayType));
throw PSERROR_Serialize_InvalidScriptValue();
}
}