pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/games/warzone2100



Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sun Oct 12 09:06:19 UTC 2025

Modified Files:
        pkgsrc/games/warzone2100: Makefile PLIST distinfo
Added Files:
        pkgsrc/games/warzone2100/patches:
            patch-3rdparty_GameNetworkingSockets_CMakeLists.txt
            patch-3rdparty_GameNetworkingSockets_src_CMakeLists.txt
            patch-3rdparty_GameNetworkingSockets_src_steamnetworkingsockets_clientlib_csteamnetworkingsockets.cpp
            patch-3rdparty_GameNetworkingSockets_src_steamnetworkingsockets_clientlib_steamnetworkingsockets__lowlevel.cpp
Removed Files:
        pkgsrc/games/warzone2100/patches:
            patch-3rdparty_basis__universal_CMakeLists.txt

Log Message:
warzone2100: Update to 4.6.1

upstream changes:
-----------------
2025-09-16: Version 4.6.1:
 * General:
   * Fix: Add various buggy drivers to the Vulkan driver blocklist (too many commits, #4560, #4568)
   * Fix: Rebuilding search paths and reloading local mods after leaving joined lobby or multiplayer game (commit:d2310199e980f5f3781ff19580c807818598909e, 
commit:f28a8d1a57b989f9964f2b16f56c9789438e6eb0, #4561)
   * Fix: Call countUpdate at init, not unsynchronized at top of gameLoop (commit:d65dcad91268e71fb26555bfadbf24c61126c082, #4564)
 * Campaign:
   * Fix: Improve campaign coordinate generators (commit:345c26dd053088d474bd37b7d5d01b8c179a91b4, #4570)
 * Multiplayer:
   * Add: hostAutoLagKickAggressiveness config value (commit:f2efcd97a65bfc3abc06c41350ea1c159d6c99d8, #4556)
   * Add: Share more host options with clients, so clients can display the state (commit:48f52846df42c9ca74f7fe03b743b04f9e823715, #4562)
   * Fix: Apply commander distance check to getDroidEffectiveLevel, other tweaks to avoid exploits (too many commits, #4559)
   * Fix: Improve not-ready check / kick / warning (too many commits, #4566)
 * Networking:
   * Fix: netplay: Use shared/weak_ptr for WzConnectionProvider, refactor shutdown handling (too many commits, #4563)
 * Translations:
   * Change: Translation updates (commit:ffe13ab5532b6997c785650167d7db273cf545bb, #4571)

2025-09-08: Version 4.6.0:
 * General:
   * Change: Bump repair spread area from 6 to 10 tiles (commit:027134f560965fec3ff37656c10f5d7e6190da5a, #4547)
   * Remove: Experimental commander-based shield implementation, leave stubs for future shield experiments (commit:b9c9dfbf4ed230e04106c25dcde3dc7cb4b8c8b1, #4537)
   * Fix: Various unloadTransporter issues and edge cases (too many commits, #4548)
 * Campaign:
   * Fix: Prevent campaign Gauss Cannon friendly splash damage (commit:c0ff325fd155e6f38f6c1dba044d9aabf7f87f26, #4543)
 * Multiplayer:
   * Fix: quickchat: Add reset & index swap handling (commit:f75c92f2250eebca74e2ad986f22b7cec080bb6f, #4540)
   * Fix: teamstrategy: Update the player names once revealed (commit:d2bedbbb06b995a3a98a965bffdbbbbab4c5b138, #4542)
   * Fix: Prevent MP penetrating weapons causing friendly fire (commit:355c5119053108b7c422de643100f5e6b176e57a, #4543)
 * Networking:
   * Fix: gns: Guard read/write accesses to activeClients_ with a mutex (commit:256788c35e9140fb9ce182aef103db6662c926e4, #4549)
 * Scripting:
   * Add: isFlying JS field to Droid objects (commit:f349292509f38c1e9c697f9f06777fc71800e8b4, #3830)
 * Translations:
   * Change: Translation updates (commit:802ce2fa34049ad05510cc34d2373f20ccef4fd3, #4536)
 * Other:
   * Update generated docs (commit:c471247a3b3c28c4ce5056e58ba5b1f89c68fce3, #4541)


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/games/warzone2100/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/games/warzone2100/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/games/warzone2100/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/warzone2100/patches/patch-3rdparty_GameNetworkingSockets_CMakeLists.txt \
    pkgsrc/games/warzone2100/patches/patch-3rdparty_GameNetworkingSockets_src_CMakeLists.txt \
    pkgsrc/games/warzone2100/patches/patch-3rdparty_GameNetworkingSockets_src_steamnetworkingsockets_clientlib_csteamnetworkingsockets.cpp \
    pkgsrc/games/warzone2100/patches/patch-3rdparty_GameNetworkingSockets_src_steamnetworkingsockets_clientlib_steamnetworkingsockets__lowlevel.cpp
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/games/warzone2100/patches/patch-3rdparty_basis__universal_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/warzone2100/Makefile
diff -u pkgsrc/games/warzone2100/Makefile:1.96 pkgsrc/games/warzone2100/Makefile:1.97
--- pkgsrc/games/warzone2100/Makefile:1.96      Sun Oct  5 19:25:58 2025
+++ pkgsrc/games/warzone2100/Makefile   Sun Oct 12 09:06:18 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2025/10/05 19:25:58 js Exp $
+# $NetBSD: Makefile,v 1.97 2025/10/12 09:06:18 triaxx Exp $
 
 DISTNAME=      warzone2100_src
-PKGNAME=       warzone2100-4.5.5
-PKGREVISION=   6
+PKGNAME=       warzone2100-4.6.1
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Warzone2100/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -21,8 +20,9 @@ USE_TOOLS+=   msgfmt msgmerge xgettext
 TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
 
 # Needs gnu standard variant to get alloca builtin.
-FORCE_CXX_STD= gnu++14
+FORCE_CXX_STD= gnu++17
 
+USE_CXX_FEATURES+=     c++17
 USE_CXX_FEATURES+=     unique_ptr
 
 .include "../../mk/bsd.prefs.mk"
@@ -68,11 +68,13 @@ PLIST_SRC=  PLIST.bundle
 .include "../../devel/cmake/build.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
+.include "../../archivers/libzip/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/physfs/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
+.include "../../devel/protobuf/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/harfbuzz/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
@@ -86,7 +88,6 @@ BUILDLINK_API_DEPENDS.glew+=          glew>=1.5.
 .include "../../net/miniupnpc/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libsodium+=      libsodium>=1.0.13
 .include "../../security/libsodium/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"

Index: pkgsrc/games/warzone2100/PLIST
diff -u pkgsrc/games/warzone2100/PLIST:1.12 pkgsrc/games/warzone2100/PLIST:1.13
--- pkgsrc/games/warzone2100/PLIST:1.12 Sat Sep 21 20:24:43 2024
+++ pkgsrc/games/warzone2100/PLIST      Sun Oct 12 09:06:18 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2024/09/21 20:24:43 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.13 2025/10/12 09:06:18 triaxx Exp $
 bin/warzone2100
 man/man6/warzone2100.6
 share/applications/net.wz2100.warzone2100.desktop
@@ -13,7 +13,6 @@ share/doc/warzone2100/ScriptingManual.ht
 share/doc/warzone2100/copyright
 share/doc/warzone2100/docbook-xsl.css
 share/doc/warzone2100/hosting/AutohostConfig.md
-share/doc/warzone2100/hosting/AutoratingServer.md
 share/doc/warzone2100/hosting/DedicatedHost.md
 share/doc/warzone2100/hosting/linux_scripts/common.sh
 share/doc/warzone2100/hosting/linux_scripts/config_sample.sh
@@ -85,6 +84,7 @@ share/locale/el/LC_MESSAGES/warzone2100.
 share/locale/en_GB/LC_MESSAGES/warzone2100.mo
 share/locale/eo/LC_MESSAGES/warzone2100.mo
 share/locale/es/LC_MESSAGES/warzone2100.mo
+share/locale/es/LC_MESSAGES/warzone2100_guide.mo
 share/locale/et_EE/LC_MESSAGES/warzone2100.mo
 share/locale/fa_IR/LC_MESSAGES/warzone2100.mo
 share/locale/fi/LC_MESSAGES/warzone2100.mo
@@ -98,13 +98,16 @@ share/locale/hu/LC_MESSAGES/warzone2100.
 share/locale/hu/LC_MESSAGES/warzone2100_guide.mo
 share/locale/id/LC_MESSAGES/warzone2100.mo
 share/locale/it/LC_MESSAGES/warzone2100.mo
+share/locale/it/LC_MESSAGES/warzone2100_guide.mo
 share/locale/ja_JP/LC_MESSAGES/warzone2100.mo
+share/locale/ja_JP/LC_MESSAGES/warzone2100_guide.mo
 share/locale/ko/LC_MESSAGES/warzone2100.mo
 share/locale/la/LC_MESSAGES/warzone2100.mo
 share/locale/lt/LC_MESSAGES/warzone2100.mo
 share/locale/my_MM/LC_MESSAGES/warzone2100.mo
 share/locale/nb/LC_MESSAGES/warzone2100.mo
 share/locale/nl/LC_MESSAGES/warzone2100.mo
+share/locale/nl/LC_MESSAGES/warzone2100_guide.mo
 share/locale/pl/LC_MESSAGES/warzone2100.mo
 share/locale/pl/LC_MESSAGES/warzone2100_guide.mo
 share/locale/pt/LC_MESSAGES/warzone2100.mo
@@ -116,8 +119,10 @@ share/locale/ru/LC_MESSAGES/warzone2100_
 share/locale/sk/LC_MESSAGES/warzone2100.mo
 share/locale/sl/LC_MESSAGES/warzone2100.mo
 share/locale/tr/LC_MESSAGES/warzone2100.mo
+share/locale/tr/LC_MESSAGES/warzone2100_guide.mo
 share/locale/tt_RU/LC_MESSAGES/warzone2100.mo
 share/locale/uk_UA/LC_MESSAGES/warzone2100.mo
+share/locale/uk_UA/LC_MESSAGES/warzone2100_guide.mo
 share/locale/zh_CN/LC_MESSAGES/warzone2100.mo
 share/locale/zh_CN/LC_MESSAGES/warzone2100_guide.mo
 share/locale/zh_TW/LC_MESSAGES/warzone2100.mo

Index: pkgsrc/games/warzone2100/distinfo
diff -u pkgsrc/games/warzone2100/distinfo:1.25 pkgsrc/games/warzone2100/distinfo:1.26
--- pkgsrc/games/warzone2100/distinfo:1.25      Tue Aug 19 12:33:49 2025
+++ pkgsrc/games/warzone2100/distinfo   Sun Oct 12 09:06:18 2025
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.25 2025/08/19 12:33:49 wiz Exp $
+$NetBSD: distinfo,v 1.26 2025/10/12 09:06:18 triaxx Exp $
 
-BLAKE2s (wz2100_4.5.5/warzone2100_src.tar.xz) = 9ca8f308ba95677e6ef5d35ab22f808d936f550a5de8a79e175775d751839d29
-SHA512 (wz2100_4.5.5/warzone2100_src.tar.xz) = b153306ea8a55334a37580c2862579f6b6a283ba3c082901fcb97fe4da3a6ae4b7bc9bd7c1fa33f39a3b5113876080b90422174f376a7ed148a18f21f57ee8b3
-Size (wz2100_4.5.5/warzone2100_src.tar.xz) = 507815568 bytes
-SHA1 (patch-3rdparty_basis__universal_CMakeLists.txt) = 58fb073caf00e883278b6862d518e328ebc5983b
+BLAKE2s (wz2100_4.6.1/warzone2100_src.tar.xz) = 049cd80f79d75674b25df58a83e80357257a74b69ea56657ac3e55d395f89f63
+SHA512 (wz2100_4.6.1/warzone2100_src.tar.xz) = 74a085e760e16605fde93bce0f82b09df6789913f4b6d138499cea6250955f63589b65035ae6463f450dcf779fdad0d2324b0e0a554c2f3f93a0d625061426b4
+Size (wz2100_4.6.1/warzone2100_src.tar.xz) = 492456208 bytes
+SHA1 (patch-3rdparty_GameNetworkingSockets_CMakeLists.txt) = da224bbd0f33c1ad73b82b196f55fd14bac55bfc
+SHA1 (patch-3rdparty_GameNetworkingSockets_src_CMakeLists.txt) = c378a6e4c6ebb97b13cda2968e50363a4d2b12c4
+SHA1 (patch-3rdparty_GameNetworkingSockets_src_steamnetworkingsockets_clientlib_csteamnetworkingsockets.cpp) = 6eadc014b177b3b87785e47b7a8def4580e7e55b
+SHA1 (patch-3rdparty_GameNetworkingSockets_src_steamnetworkingsockets_clientlib_steamnetworkingsockets__lowlevel.cpp) = bd735e97f45e4246f6002691ef151e2a5bfd281d

Added files:

Index: pkgsrc/games/warzone2100/patches/patch-3rdparty_GameNetworkingSockets_CMakeLists.txt
diff -u /dev/null pkgsrc/games/warzone2100/patches/patch-3rdparty_GameNetworkingSockets_CMakeLists.txt:1.1
--- /dev/null   Sun Oct 12 09:06:19 2025
+++ pkgsrc/games/warzone2100/patches/patch-3rdparty_GameNetworkingSockets_CMakeLists.txt        Sun Oct 12 09:06:19 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-3rdparty_GameNetworkingSockets_CMakeLists.txt,v 1.1 2025/10/12 09:06:19 triaxx Exp $
+
+Add support for NetBSD.
+
+--- 3rdparty/GameNetworkingSockets/CMakeLists.txt.orig 2025-09-16 16:42:25.000000000 +0000
++++ 3rdparty/GameNetworkingSockets/CMakeLists.txt
+@@ -157,6 +157,8 @@ function(set_target_common_gns_propertie
+               target_compile_definitions(${TGT} PUBLIC OSX)
+       elseif(CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+               target_compile_definitions(${TGT} PUBLIC FREEBSD)
++      elseif(CMAKE_SYSTEM_NAME MATCHES NetBSD)
++              target_compile_definitions(${TGT} PUBLIC NETBSD)
+       elseif(CMAKE_SYSTEM_NAME MATCHES Windows)
+               target_compile_definitions(${TGT} PUBLIC _WINDOWS)
+               if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
Index: pkgsrc/games/warzone2100/patches/patch-3rdparty_GameNetworkingSockets_src_CMakeLists.txt
diff -u /dev/null pkgsrc/games/warzone2100/patches/patch-3rdparty_GameNetworkingSockets_src_CMakeLists.txt:1.1
--- /dev/null   Sun Oct 12 09:06:19 2025
+++ pkgsrc/games/warzone2100/patches/patch-3rdparty_GameNetworkingSockets_src_CMakeLists.txt    Sun Oct 12 09:06:19 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-3rdparty_GameNetworkingSockets_src_CMakeLists.txt,v 1.1 2025/10/12 09:06:19 triaxx Exp $
+
+Add support for NetBSD.
+
+--- 3rdparty/GameNetworkingSockets/src/CMakeLists.txt.orig     2025-10-04 05:31:24.682303526 +0000
++++ 3rdparty/GameNetworkingSockets/src/CMakeLists.txt
+@@ -296,6 +296,8 @@ macro(set_clientlib_target_properties GN
+               #endif()
+       elseif(CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+ 
++      elseif(CMAKE_SYSTEM_NAME MATCHES NetBSD)
++
+       elseif(CMAKE_SYSTEM_NAME MATCHES Windows)
+               if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+                       get_target_property(TARGET_TYPE ${GNS_TARGET} TYPE)
Index: pkgsrc/games/warzone2100/patches/patch-3rdparty_GameNetworkingSockets_src_steamnetworkingsockets_clientlib_csteamnetworkingsockets.cpp
diff -u /dev/null pkgsrc/games/warzone2100/patches/patch-3rdparty_GameNetworkingSockets_src_steamnetworkingsockets_clientlib_csteamnetworkingsockets.cpp:1.1
--- /dev/null   Sun Oct 12 09:06:19 2025
+++ pkgsrc/games/warzone2100/patches/patch-3rdparty_GameNetworkingSockets_src_steamnetworkingsockets_clientlib_csteamnetworkingsockets.cpp      Sun Oct 12 09:06:19 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-3rdparty_GameNetworkingSockets_src_steamnetworkingsockets_clientlib_csteamnetworkingsockets.cpp,v 1.1 2025/10/12 09:06:19 triaxx Exp $
+
+Add support for NetBSD.
+
+--- 3rdparty/GameNetworkingSockets/src/steamnetworkingsockets/clientlib/csteamnetworkingsockets.cpp.orig       2025-09-16 16:42:25.000000000 +0000
++++ 3rdparty/GameNetworkingSockets/src/steamnetworkingsockets/clientlib/csteamnetworkingsockets.cpp
+@@ -2444,6 +2444,8 @@ const char *CSteamNetworkingUtils::GetPl
+               return "linux";
+       #elif defined( FREEBSD ) || defined( __FreeBSD__ )
+               return "freebsd";
++      #elif defined( NETBSD ) || defined( __NetBSD__ )
++              return "netbsd";
+       #else
+               #error "Unknown platform"
+       #endif
Index: pkgsrc/games/warzone2100/patches/patch-3rdparty_GameNetworkingSockets_src_steamnetworkingsockets_clientlib_steamnetworkingsockets__lowlevel.cpp
diff -u /dev/null pkgsrc/games/warzone2100/patches/patch-3rdparty_GameNetworkingSockets_src_steamnetworkingsockets_clientlib_steamnetworkingsockets__lowlevel.cpp:1.1
--- /dev/null   Sun Oct 12 09:06:19 2025
+++ pkgsrc/games/warzone2100/patches/patch-3rdparty_GameNetworkingSockets_src_steamnetworkingsockets_clientlib_steamnetworkingsockets__lowlevel.cpp     Sun Oct 12 09:06:19 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-3rdparty_GameNetworkingSockets_src_steamnetworkingsockets_clientlib_steamnetworkingsockets__lowlevel.cpp,v 1.1 2025/10/12 09:06:19 triaxx Exp $
+
+NetBSD does not implement AI_V4MAPPED in netbsd.h.
+
+--- 3rdparty/GameNetworkingSockets/src/steamnetworkingsockets/clientlib/steamnetworkingsockets_lowlevel.cpp.orig       2025-10-12 04:45:00.662361482 +0000
++++ 3rdparty/GameNetworkingSockets/src/steamnetworkingsockets/clientlib/steamnetworkingsockets_lowlevel.cpp
+@@ -4204,7 +4204,11 @@ bool ResolveHostname( const char* pszHos
+ 
+       addrinfo hints;
+       V_memset( &hints, 0, sizeof( hints ) );
++#ifdef AI_V4MAPPED
+       hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG;
++#else
++      hints.ai_flags = AI_ADDRCONFIG;
++#endif
+       hints.ai_family = AF_UNSPEC;
+       hints.ai_socktype = 0;
+       hints.ai_protocol = 0;



Home | Main Index | Thread Index | Old Index