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

[Michael Sterrett]

commit:     ca000adb5b3ed930e21f729a57f8ad0f0715280d
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  5 00:44:52 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Mon Oct  5 00:47:23 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca000adb

add patch from Sander Sweers to support building against newer miniupnpc (bug 
#562046)

Package-Manager: portage-2.2.20.1

 .../files/megaglest-3.11.1-miniupnpc.patch          | 21 +++++++++++++++++++++
 games-strategy/megaglest/megaglest-3.11.1.ebuild    |  3 ++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch 
b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch
new file mode 100644
index 0000000..112e734
--- /dev/null
+++ b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch
@@ -0,0 +1,21 @@
+diff --git a/source/shared_lib/sources/platform/posix/socket.cpp 
b/source/shared_lib/sources/platform/posix/socket.cpp
+index a5d4b92..cb8ceb4 100644
+--- a/source/shared_lib/sources/platform/posix/socket.cpp
++++ b/source/shared_lib/sources/platform/posix/socket.cpp
+@@ -2563,9 +2563,15 @@ int UPNP_Tools::upnp_init(void *param) {
+               const char *upnp_minissdpdsock = NULL;
+               int upnp_sameport = 0;
+               int upnp_ipv6 = 0;
++              unsigned char upnp_ttl = 2;
+               int upnp_error = 0;
+ 
+-#ifndef MINIUPNPC_VERSION_PRE1_6
++#if (MINIUPNPC_API_VERSION >= 14)
++              devlist = upnpDiscover(upnp_delay, upnp_multicastif, 
upnp_minissdpdsock, upnp_sameport, upnp_ipv6, upnp_ttl, &upnp_error);
++
++              
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) 
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned 
upnp_error = %d.\n",upnp_error);
++              if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP discover 
returned upnp_error = %d.\n",upnp_error);
++#elif (MINIUPNPC_API_VERSION >= 8)
+               devlist = upnpDiscover(upnp_delay, upnp_multicastif, 
upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
+ 
+               
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) 
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned 
upnp_error = %d.\n",upnp_error);

diff --git a/games-strategy/megaglest/megaglest-3.11.1.ebuild 
b/games-strategy/megaglest/megaglest-3.11.1.ebuild
index 7776e56..3c74a8d 100644
--- a/games-strategy/megaglest/megaglest-3.11.1.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1.ebuild
@@ -71,7 +71,8 @@ src_prepare() {
        fi
 
        epatch "${FILESDIR}"/${P}-static-build.patch \
-               "${FILESDIR}"/${P}-cmake.patch
+               "${FILESDIR}"/${P}-cmake.patch \
+               "${FILESDIR}"/${P}-miniupnpc.patch
 }
 
 src_configure() {