diff --git a/games-action/bzflag/Manifest b/games-action/bzflag/Manifest index d2bc985b785fb..1d1f685b12509 100644 --- a/games-action/bzflag/Manifest +++ b/games-action/bzflag/Manifest @@ -1,2 +1,2 @@ DIST bzflag-2.4.26.tar.bz2 14107130 BLAKE2B f7fe50910f49f82c7316d19f7b5dba2de26cbe2b928c29158b725be6424d5a55423e2d390c8c0d96cc40ff90191c6d1ab0d378014381ef44f6fcd534c06fc9a9 SHA512 1ca039d840440098ea788009ad94fccec20710f621967843b5f95dc4ee054cb1d5d9b94326687008cf7a11020889225ffe9001aac1c7c4339f6761961f422a78 -DIST bzflag-2.4.28.tar.bz2 13993838 BLAKE2B 9a18ae8adc5f089035cace94a8b8accf2661aa0cb1c15ebabe35267733db0ee8e290a73496d62d6ecf565526e70827952721cd9855f704dc010808244862f0b5 SHA512 6ddb32b0e7a6d131e45d50283ad8afac96c792f649843f7f4a1b4716e5c0f02f9efcbe6f919b710c3bc730c761fe07be48ea9a00612431ac6762c44ec9794ef1 +DIST bzflag-2.4.30.tar.bz2 14131760 BLAKE2B 87fa0ee00247f96d1cc383f5495b1ad6a4d0b1403fbb0894942413017410dc7d0397aaca59fd665422dd344fd27506a3e426be7503637b4a02c45fcb113e749c SHA512 66361b4b1419876d3350fa773aa86822f5adfc4fac282a1061dfbcc3ee5e95505ce80a54379250ca24f41550a15d2eb77487e5fa8cd6a78b3efc0d79167e2d5c diff --git a/games-action/bzflag/bzflag-2.4.28.ebuild b/games-action/bzflag/bzflag-2.4.30.ebuild similarity index 94% rename from games-action/bzflag/bzflag-2.4.28.ebuild rename to games-action/bzflag/bzflag-2.4.30.ebuild index ff2f456e49f5f..0a1d4e593e401 100644 --- a/games-action/bzflag/bzflag-2.4.28.ebuild +++ b/games-action/bzflag/bzflag-2.4.30.ebuild @@ -33,6 +33,7 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-2.4.12-configure.patch "${FILESDIR}"/${PN}-2.4.12-tinfo.patch + "${FILESDIR}"/${P}-miniupnpc.patch ) DOCS=( AUTHORS ChangeLog DEVINFO PORTING README README.Linux ) @@ -52,9 +53,7 @@ src_configure() { ewarn ewarn "You are building a server-only copy of BZFlag" ewarn - myconf+=( --disable-client --without-SDL ) - else - myconf=( --with-SDL=2 ) + myconf+=( --disable-client ) fi econf "${myconf[@]}" diff --git a/games-action/bzflag/files/bzflag-2.4.30-miniupnpc.patch b/games-action/bzflag/files/bzflag-2.4.30-miniupnpc.patch new file mode 100644 index 0000000000000..3ea45add3b590 --- /dev/null +++ b/games-action/bzflag/files/bzflag-2.4.30-miniupnpc.patch @@ -0,0 +1,14 @@ +--- a/src/bzfs/bzfs.cxx 2025-03-19 20:12:39.291545789 +0100 ++++ b/src/bzfs/bzfs.cxx 2025-03-19 20:19:01.024737235 +0100 +@@ -6291,7 +6291,11 @@ + return; + } + // Select a good IGD (Internet Gateway Device) ++#if MINIUPNPC_API_VERSION >= 18 ++ int i = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), nullptr, 0); ++#else + int i = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr)); ++#endif + freeUPNPDevlist(devlist); + if (!i) + std::cerr << "No recognized device" << std::endl;