From nobody Tue Jul 16 21:02:11 2024 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 4WNs2X0DYHz5QFHS; Tue, 16 Jul 2024 21:02:12 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WNs2W6tJLz4J9p; Tue, 16 Jul 2024 21:02:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721163732; 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=FqQ5jjMyCqPf6jzzwo478r7D6wEzaiEnDp1fwStLXxA=; b=S+hMFui0Zfyg6BC2yDHIt2qASE/+K4K55RoS1rLbjiwA8fb43arj4G9eYg6y+Xv3xrEOG0 oTmRN3EuKURV1yzjCCFTOm9v4GoU8/y0YgCqf61Rh0duh6aksoXqDFyba87EsKunPFcU8K TEYpvxJartAgyiPUL0rIs3YwBUB6HpM9B3EyaCLhyuibJtbbxcqW8NoN9hhk+snmjOytXi ig541snM+/JxcTK5XlM79bE6jymgtMJYpeLD84z4FCYMhblBRVOmfzG0MRmYJ7mm6/gFTb x97v/LFM+20EcBBWb/udXt9NUjExfdl/SGqeuGZhg0YCIWy/mW9sWfqncjPTVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721163732; a=rsa-sha256; cv=none; b=UKz/ThXfEqQqAY4P1qDXUu6xHpZxFL3zqZLK+encopkExUi8pFVpUChW2XjgC2gub/kd0l 6yH0Wce3MYSJo7Nu9ToATa4xq2r+f/GA5WUgcepDBZMD1Wtg6KV+vnBY3g69mHYkdDKMZ8 YBUoCWiTp8iHxlV/ad3S8shBQAoWMf9jjtr4VvpgQyjLygafo5Q9Ok5IwzueUTRCH28lH0 4E5vKDVGKqlBTsJ49vfVYQlz0bv5RlIihIHKMNgB65YoL3KTypJ7Zcd6iHkmP3CK7mlhXw Abl6FjJwBquY+sDZp005y1QKBrpRsd7xYwhOeN0HWFCHpcXzmj6EK9bEXw7FVg== 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=1721163732; 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=FqQ5jjMyCqPf6jzzwo478r7D6wEzaiEnDp1fwStLXxA=; b=skmHIT7iSA1vU46ABhGR1BNGel07IvK/a8y4dw8XJahaS4VxI6HeNpRVKbcM3/PFgMDDhW 6+r846pZSamFHR+eI5xi3UzeRD443KbUVmtAwa7vEZdvX8RtUNnHBO9bKH1fPSmoNSxSaA UR+e6ds2yGgn9qR9uyBvhg5OwRdFknFRF2rcdwG08m2lCgoy5SAbE8YV2igK0zuksRh9Wv MugAY9ybjt4aSLpAVBMQyVWnbm9He+vVuXdYXHmFbRRm3ppUUZ0yLmBUpposuGTgQ6hqRO l+utn6bnc4TIkcprLfqhZNiJrKP3iK09/ER4M6BXvGwQp/pV/X7nAa3gpnpmbg== 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 4WNs2W69pczrkD; Tue, 16 Jul 2024 21:02:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46GL2BxB066081; Tue, 16 Jul 2024 21:02:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46GL2BWp066078; Tue, 16 Jul 2024 21:02:11 GMT (envelope-from git) Date: Tue, 16 Jul 2024 21:02:11 GMT Message-Id: <202407162102.46GL2BWp066078@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: 012e8794d732 - main - games/0ad: Fix build with miniupnpc 2.2.8 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 012e8794d732dfc026e160bede5e78862dd65fae Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=012e8794d732dfc026e160bede5e78862dd65fae commit 012e8794d732dfc026e160bede5e78862dd65fae Author: Guido Falsi AuthorDate: 2024-07-16 20:56:18 +0000 Commit: Guido Falsi CommitDate: 2024-07-16 20:56:18 +0000 games/0ad: Fix build with miniupnpc 2.2.8 PR: 280298 Suggested by: Stefan Ehmann Obtained from: https://bugs.gentoo.org/934315 --- games/0ad/files/patch-source_network_NetServer.cpp | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/games/0ad/files/patch-source_network_NetServer.cpp b/games/0ad/files/patch-source_network_NetServer.cpp new file mode 100644 index 000000000000..6866c8a427f5 --- /dev/null +++ b/games/0ad/files/patch-source_network_NetServer.cpp @@ -0,0 +1,33 @@ +--- source/network/NetServer.cpp.orig 2022-09-23 19:17:14 UTC ++++ source/network/NetServer.cpp +@@ -302,7 +302,11 @@ void CNetServerWorker::SetupUPnP() + else if ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 0)) != NULL) + #endif + { ++#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 18 ++ ret = UPNP_GetValidIGD(devlist, &urls, &data, internalIPAddress, sizeof(internalIPAddress), NULL, 0); ++#else + ret = UPNP_GetValidIGD(devlist, &urls, &data, internalIPAddress, sizeof(internalIPAddress)); ++#endif + allocatedUrls = ret != 0; // urls is allocated on non-zero return values + } + else +@@ -321,9 +325,18 @@ void CNetServerWorker::SetupUPnP() + LOGMESSAGE("Net server: found valid IGD = %s", urls.controlURL); + break; + case 2: ++#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 18 ++ LOGMESSAGE("Net server: found a valid IGD with a reserved address = %s, will try to continue anyway", urls.controlURL); ++ break; ++ case 3: + LOGMESSAGE("Net server: found a valid, not connected IGD = %s, will try to continue anyway", urls.controlURL); + break; ++ case 4: ++#else ++ LOGMESSAGE("Net server: found a valid, not connected IGD = %s, will try to continue anyway", urls.controlURL); ++ break; + case 3: ++#endif + LOGMESSAGE("Net server: found a UPnP device unrecognized as IGD = %s, will try to continue anyway", urls.controlURL); + break; + default: