[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/, games-strategy/0ad/files/

[Lars Wendler]

commit:     07e960f32ebc7de1ef0604b8242a77918f9362c8
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  2 07:44:43 2015 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Oct  2 07:50:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e960f3

games-strategy/0ad: Added an upstream patch for new miniupnpc API.

Package-Manager: portage-2.2.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild              |  3 ++-
 .../0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch           | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild 
b/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
index e9c57bd..654bb3d 100644
--- a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
+++ b/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
        media-libs/libpng:0
        media-libs/libsdl2[X,opengl,video]
        net-libs/enet:1.3
-       net-libs/miniupnpc
+       net-libs/miniupnpc:=
        net-misc/curl
        sys-libs/zlib
        virtual/jpeg:62
@@ -57,6 +57,7 @@ pkg_setup() {
 
 src_prepare() {
        epatch "${FILESDIR}"/${P}-gentoo.patch
+       epatch "${FILESDIR}"/${P}-miniupnpc14.patch
 }
 
 src_configure() {

diff --git a/games-strategy/0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch 
b/games-strategy/0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch
new file mode 100644
index 0000000..ff46685
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch
@@ -0,0 +1,14 @@
+Index: ps/trunk/source/network/NetServer.cpp
+===================================================================
+--- ps/trunk/source/network/NetServer.cpp      (revision 17090)
++++ ps/trunk/source/network/NetServer.cpp      (revision 17091)
+@@ -237,5 +237,9 @@
+       }
+       // No cached URL, or it did not respond. Try getting a valid UPnP 
device for 10 seconds.
++#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 14
++      else if ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 2, 0)) != NULL)
++#else
+       else if ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 0)) != NULL)
++#endif
+       {
+               ret = UPNP_GetValidIGD(devlist, &urls, &data, 
internalIPAddress, sizeof(internalIPAddress));