diff options
Diffstat (limited to 'games-strategy/megaglest')
| -rw-r--r-- | games-strategy/megaglest/ChangeLog | 8 | ||||
| -rw-r--r-- | games-strategy/megaglest/Manifest | 19 | ||||
| -rw-r--r-- | games-strategy/megaglest/files/megaglest-3.7.1-miniupnpc-1.8.patch | 158 | ||||
| -rw-r--r-- | games-strategy/megaglest/megaglest-3.7.1.ebuild | 6 |
4 files changed, 184 insertions, 7 deletions
diff --git a/games-strategy/megaglest/ChangeLog b/games-strategy/megaglest/ChangeLog index e543f7925c80..ef483b3749c1 100644 --- a/games-strategy/megaglest/ChangeLog +++ b/games-strategy/megaglest/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/megaglest -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.12 2012/12/28 11:28:19 ago Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.13 2013/02/12 16:58:28 hasufell Exp $ + + 12 Feb 2013; Julian Ospald <hasufell@gentoo.org> megaglest-3.7.1.ebuild, + +files/megaglest-3.7.1-miniupnpc-1.8.patch: + fix build with miniupnpc-1.8 wrt #456952 28 Dec 2012; Agostino Sarubbo <ago@gentoo.org> megaglest-3.7.1.ebuild: Stable for x86, wrt bug #448546 diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest index 64a9e4f344e1..6d39d407b06c 100644 --- a/games-strategy/megaglest/Manifest +++ b/games-strategy/megaglest/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX megaglest-3.6.0.3-as-needed.patch 909 SHA256 e3b2117f9e524e44e815d9fe7d56c7f807d0e6fd78d582f7dfa7ac0bd82d97c7 SHA512 4c2d371ebc132c5c608a2f5110af00001fb8214a0f99bd8bf1b6af61e0e5679df5593011bd2cf63489974b817ac133c157b46acf2398f11c9294e11215aae5e3 WHIRLPOOL c1397df2335f2076cf1bae3e68f02c9b717def51c706b3d7716436ee0df003fb8a5ad9927594612d0800ec13f71bdf4f90369234b70f9e5a37a7a0155f87a5e8 AUX megaglest-3.6.0.3-build.patch 1050 SHA256 fe00f58335e551b29e23efd66cb6ff16780d81c992522601981bd2a211932bc1 SHA512 f1ab9698f2a91a765a888030bb317d4ae6093f6070d7f068d142993100975be826c6db84278a6bb662b6a2e25df94b5968aa10cf9db08083d76e9c4beb4b2f62 WHIRLPOOL 04d1b7e3cd40a265a6ba181a63b28fbf5edef2b88174afda71fc5940ce2f3a65fbf77db1531c6e368619904bc5ab940279442c4d9a1b301d7f03ee9ac4020cfb AUX megaglest-3.6.0.3-gcc-4.7.patch 910 SHA256 76527db1795587d64d4d7eb0ec9be540f5abf9619d469095f6c24e9c12d261cc SHA512 d406910fc7ab04c142e565b61b91347b20a842ca10e5575e11e788d6d147f994f5ed441d6f3b8f6155da2bcb4288a81d0387ed1bdb4f21302713b657891916e2 WHIRLPOOL 6f8b31233b607d26e64d78f8255e15d3917b239f4a084ac2e8b6c5587f8c88c40f11519403555319db0a11cddffe73a7ef3b4dfbfc1d8af8d9e54f9025788a67 @@ -6,12 +9,24 @@ AUX megaglest-3.7.0-as-needed.patch 952 SHA256 16c9f661e91c1415934f6e3f52a5a2603 AUX megaglest-3.7.0-cmake.patch 1338 SHA256 745762db3540ce2c376706d2bd40e9cb6654e4360e53ab1509f8a3a7d56d4fe2 SHA512 38e24af6958b374155ba651d80088f3fffedc4099a136e4e7955a48faa6e4a42dbc2942b1eea5bd1768a3cbbaaa6c3f3faed384fec8178f9f79974510f97fba0 WHIRLPOOL f7d9b5f0a0810b946547c8222fbcf824ff7adac8be55bbf931ddaa9e4ea55b88b4e3ba53e6d49f4f18e7e591860be0be5001767187e0818c2d09a8c0b2a4ac1d AUX megaglest-3.7.0-static-build.patch 4148 SHA256 aad7b46e8825f951f0f07d1d60be3a7b9e4728b870b59c1589f86ef6335347d1 SHA512 7c3beff249c48969280e053dbc7eec8f2a22e817b2d05df18abc9bdfa97ad3a7a3132700077a08efda85d039bb501c62cf3ddb50b408f7e9e83bbb03cd1123fa WHIRLPOOL 4ad78f27ebc4dd6726d26ecb2b30e22af07ba17944bb4907a5156092d7388c510b3dc9ffa244fc2d83d6bf39274b32350038cdd20427d551185b28eaf3bc5e77 AUX megaglest-3.7.1-as-needed.patch 905 SHA256 2add7ce9a6fb69c16a5da4513c57839a66abfe22995136e2617bf85c3697fa9d SHA512 cec1c5fec30b1cd7378b6cd18e09a513c1bcd64d5149af4c2bb3fbc2ff134914e96e142d78b56f6037a9e3975f3bd689894dcdc66aaae83ee59e1cd57ecb5d2b WHIRLPOOL 8e5a15b8d8798327ed8f444b2a6429327be2bd577bf1c58a8f516cad7b6f7babb57d415e8af2ba78e5b83b6918bc67da10b87f505d02e216ab777f2fc1f30bda +AUX megaglest-3.7.1-miniupnpc-1.8.patch 6273 SHA256 d93fcd76a9fdbbb72b6b6c9bc2abde64433727f5833bf9e3adf145091beb05d7 SHA512 54c5c45dfe211ec462ec38c67696bbd40b630ea8976bc06d3bd704773d14aefbab7a2e60ab7e80b092b384da7ce19955cd8d5c6c140f4201ec9adefd6a9f67b3 WHIRLPOOL 9b9841aebb853fec5cf711af79f31fc5413f9626f4998822f76cd23e9624daf44cbd061cf4b467b8a019b75df7966a789cf53771dd8761bb3bdcc6efee4bf454 AUX megaglest-3.7.1-static-build.patch 4008 SHA256 8067115f3424ce213c87ed476d227aebe5f910de935d65bb96c079b6faf44cff SHA512 0403e04783009c66a0199b2c3c793b74dd11cc89189b29494e56b826297afab8349a4e4ad1c5c5c6dc302e9d1b82b62f010ec379e28d6760c0ee89803ceef571 WHIRLPOOL 0bc7c36b10d9256dd5cc49b2c0fba93f2874b7cbf26aed7dd91f20675dff4d742736866960138d66516c4e27ca63be69f0248f82376e32494967f7125af9d291 DIST megaglest-source-3.6.0.3.tar.xz 1336432 SHA256 700b1eef534d72fa5efd329445aa085259a87dcea5e739eda629e6c41386b9f7 SHA512 0152457444c8d4ed65ed2ae565a73a2921a3706bb653fa818be03fb15d6fac196d50fc616583ce4c6fe7e76d4fb82cc83eb7c16809a90edf705701bab9c95387 WHIRLPOOL e452cd6dafb9024b663c62c9c3077af725601c6bc7b34b54cef641feb7ecbf2d1c1b6625e016e6e149055782d303a7bff78b59f29eb3c72d010c2a8b8a554b6f DIST megaglest-source-3.7.0.tar.xz 1442444 SHA256 5fdf2ed072c8a207a42b280929a7ce097ed6f966b2b85a7f0a89e741ac5cca23 SHA512 113bb59a4f8ec2b0d83b30952f7723c8a9a835b4854a083327c13a87f69c45d66184025bc0dd1af4ebfebeaa6d8ea7f488b859bcb8c04a8ecc5bcad8ac8bb35c WHIRLPOOL 16c5c56c0b8b9374b024178a3d780a21b7594398acb27f4d32ede39567edb6238a1122baaa57272134e62ae2de7c855db8384efd31d6171b7dbc4717249f63a6 DIST megaglest-source-3.7.1.tar.xz 1439864 SHA256 0222196c6a274cfd1b5fd074206a6bedcf3da4f343345f3e2682e704f94adc26 SHA512 b285421175d7eeb7c52c45c9397d270ed4352ec1c9f547b5a18ec596d676a8fd00b54d7138c9b6ccba07bc8218054587ccb9822c30216a846d4da64c7a2ae600 WHIRLPOOL a8d50d49b9470aaf29121e427ee9137980f0fcbc11f962217581d679d6e7d10c2daa5a68648b45c5384ff1bfed7cfa73fb2600cf872b12f64f59729ca759872f EBUILD megaglest-3.6.0.3.ebuild 4606 SHA256 9469dc487853bb86680056013aa5504febbf8b8ff2c0f88fe1d06d3edc47330c SHA512 acca3c865434c5ec7a040682f402afb3092345f28308a77053854d49daf8675159bc68460fd9f58a352b8f51f70df9b1f022929345fbd8ea100b04146a368e4a WHIRLPOOL b3d66b583243ab9c2a884dc1e333a695d0209b759cdaa457b952ec7e04c62e888f01b723d737a10877bb3b5892f9045ce6c0c6907ca39ccb7065a65c3f1dc93d EBUILD megaglest-3.7.0.ebuild 4293 SHA256 e049344912090005087a4758b08388c496487ebfe65885a3286320f16b916de1 SHA512 04e9dc4f0bd77f428cce0482353e8da09344a5df69bc695c3ecac27e1b52ab2d5a3019c9b2940119c4c525b6b4de2f0509ff95f4eb1c43f924ca10f2e0cb5ef1 WHIRLPOOL 8359489f4251e9f69334d121711e07c5c4e9704af236bed889e2350986c3a93d5dcde53512145368d261ecbbf63b077d75ad825ca481cca26340980c3567ae46 -EBUILD megaglest-3.7.1.ebuild 4279 SHA256 b079428d4408fc1007154de59772e00400306ea9e645f20f6c94ccbca0c4660f SHA512 2b7ff30108d726535fdcd2610de9e267fe02115e76536faf5b943e26d72cc859e2a29635d6bb76c4ae15a166edb0f11976b68b95b67805ddc40392cdf800d097 WHIRLPOOL 5344949e696c86fb5effe78a733671ce40a736867eeeb05b124d5071ab38f9af5502f013c49d6ec88e555258548ba55195b9f11bce766dc00c9406b126936b8e -MISC ChangeLog 2058 SHA256 359c6579b6bad3bc24c0398b0df342486e49ed131f9d9ed7757eacb9f50511d3 SHA512 aa8575fcd6556faa459986f7c9ee74471fa03b946b5523bd4f7404830ad7859e330a05703c53ad9382dcdab0e147e536d76e8cdba65f4c500e3cbe197082df0f WHIRLPOOL d10e00fd39693ebb08be6312c3158dae200a65409081f6d2465b3f15359410768fdeb2d3f2dfb7fe24751f208a06f1b7c77cd7e3404df9bc58ea780063dcb4e7 +EBUILD megaglest-3.7.1.ebuild 4298 SHA256 94fbd5f1111b48ccaf5d4cc2b9d55f9094fd47503e4b217e5aece3491f1e04b0 SHA512 8a5479b061a94750d1a3af7a0d19eb1b8b5dede42ecfea27518724225d37887288ac8ba91e251e14cef06325ff8aa4080e0fbe5ad30ce1b2b5ced3b65a3a11fe WHIRLPOOL 6b2ecfd6fcaea77e3fcbfb4975d2377581f8c935ebfc40723de761f9445132938528d9c516135da11ba63c95797595dfdc7f8e706d037e5e4aff383ab8b42430 +MISC ChangeLog 2228 SHA256 225e3aa6194cf0ef2cdc70c00842f868e548150b41e320b4937b7a3cd8d92b84 SHA512 d4aeb857d0d7bdc27078df35a3359549a4da34924428bc5e081a55f7a3fe9769a546f503fd01c4df799378b7db48d6eb405bcdd97fd0b88e06c1f68aa3518284 WHIRLPOOL 2725d7cd14a6e10b7b8eddd95e6735a791757184cba3550b6e0b8e753333312ebf7a29467390d747dbabf0c5f6b32fd224a81dca00cee6bde430762d22f78155 MISC metadata.xml 1550 SHA256 ea7604fb5e9f322911cbb140fe67410a5e8e40f4854c9691c984331d60e3bf2a SHA512 e8b697d2c6af8e42a7dd304e8c3f2325ce676bfe50f2eb626933f95ebe50fd656964f0f497451bda3be269e743f642714e9b2660f42ca23352b909af0670d7bb WHIRLPOOL 2109e05f6de9b86a543b08025bdc26987354983fed4bc2e6315d27a4254f07ea8291af1e4587a07162c8ad9d5795f5b2915b523fc617259af4de65d61c13eb61 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBCAAGBQJRGnS6AAoJEFpvPKfnPDWz0v8H/AmiYBs/ydettLwOBfg6scJ9 +oWLNY30fHTkaLJ7ia46Vs9cANLXR3f0PgXaHiqBiK5rYNTNHOb4G4wwcOY+e491X +weI+9BXxu+zxPgMoGsOBCdOOyYQvDXG51dVQ6uS+fR0bGjclr7s/ycjOs0T3DOB5 +UH9+xe6DO37Us06oWjbeP65BxJJqtC8ryUs5ls0DDysXRm2gFfyg46z/J/LX7AUN +CgFi6rjw4DKmcI7PIrhQxCgXjWGMK3MmSH37AT8qImVDTFjsFPuYMg8Vn6P8IHrQ +BzB7jOniaE1phjOxSeXdF1mO6+NtRnQ1EJafWq5FTA3GQ7xAZgugqPkd5Cl+HeM= +=j75I +-----END PGP SIGNATURE----- diff --git a/games-strategy/megaglest/files/megaglest-3.7.1-miniupnpc-1.8.patch b/games-strategy/megaglest/files/megaglest-3.7.1-miniupnpc-1.8.patch new file mode 100644 index 000000000000..61177224a070 --- /dev/null +++ b/games-strategy/megaglest/files/megaglest-3.7.1-miniupnpc-1.8.patch @@ -0,0 +1,158 @@ +http://megaglest.svn.sourceforge.net/viewvc/megaglest?view=revision&revision=3958 +https://bugs.gentoo.org/show_bug.cgi?id=456952 + +--- trunk/source/shared_lib/CMakeLists.txt 2012/12/24 18:05:13 3957 ++++ trunk/source/shared_lib/CMakeLists.txt 2012/12/26 01:11:11 3958 +@@ -297,7 +297,12 @@ + ADD_DEFINITIONS(-DMINIUPNPC_VERSION_PRE1_6) + message(STATUS "Adding macro for miniupnpc version: pre v1.6") + ENDIF() +- IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6) ++ IF(MINIUPNPC_VERSION_PRE1_7) ++ ADD_DEFINITIONS(-DMINIUPNPC_VERSION_PRE1_7) ++ message(STATUS "Adding macro for miniupnpc version: pre v1.7") ++ ENDIF() ++ ++ IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7) + message(STATUS "**No macros required for miniupnpc version") + ENDIF() + +--- trunk/mk/cmake/Modules/FindMiniupnpc.cmake 2012/12/24 18:05:13 3957 ++++ trunk/mk/cmake/Modules/FindMiniupnpc.cmake 2012/12/26 01:11:11 3958 +@@ -58,20 +58,40 @@ + #include <stdio.h> + int main() + { +- struct UPNPDev *devlist = NULL; +- int upnp_delay = 5000; +- const char *upnp_multicastif = NULL; +- const char *upnp_minissdpdsock = NULL; +- int upnp_sameport = 0; +- int upnp_ipv6 = 0; +- int upnp_error = 0; +- devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error); ++ static struct UPNPUrls urls; ++ static struct IGDdatas data; ++ ++ GetUPNPUrls (&urls, &data, \"myurl\",0); + + return 0; + }" +- MINIUPNPC_VERSION_1_6_OR_HIGHER) +- +- IF (NOT MINIUPNPC_VERSION_1_6_OR_HIGHER) ++ MINIUPNPC_VERSION_1_7_OR_HIGHER) ++ ++ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER) ++ set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR}) ++ set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY}) ++ check_cxx_source_runs(" ++ #include <miniwget.h> ++ #include <miniupnpc.h> ++ #include <upnpcommands.h> ++ #include <stdio.h> ++ int main() ++ { ++ struct UPNPDev *devlist = NULL; ++ int upnp_delay = 5000; ++ const char *upnp_multicastif = NULL; ++ const char *upnp_minissdpdsock = NULL; ++ int upnp_sameport = 0; ++ int upnp_ipv6 = 0; ++ int upnp_error = 0; ++ devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error); ++ ++ return 0; ++ }" ++ MINIUPNPC_VERSION_PRE1_7) ++ ENDIF() ++ ++ IF (NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER) + set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY}) + check_cxx_source_runs(" +@@ -96,25 +116,27 @@ + + ENDIF() + +- set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR}) +- set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY}) +- check_cxx_source_runs(" +- #include <miniwget.h> +- #include <miniupnpc.h> +- #include <upnpcommands.h> +- #include <stdio.h> +- static struct UPNPUrls urls; +- static struct IGDdatas data; +- int main() +- { +- char externalIP[16] = ""; +- UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIP); ++ IF (NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER) ++ set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR}) ++ set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY}) ++ check_cxx_source_runs(" ++ #include <miniwget.h> ++ #include <miniupnpc.h> ++ #include <upnpcommands.h> ++ #include <stdio.h> ++ static struct UPNPUrls urls; ++ static struct IGDdatas data; ++ int main() ++ { ++ char externalIP[16] = ""; ++ UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIP); + +- return 0; +- }" +- MINIUPNPC_VERSION_1_5_OR_HIGHER) ++ return 0; ++ }" ++ MINIUPNPC_VERSION_1_5_OR_HIGHER) ++ ENDIF() + +- IF (NOT MINIUPNPC_VERSION_1_5_OR_HIGHER) ++ IF (NOT MINIUPNPC_VERSION_1_5_OR_HIGHER AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER) + set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY}) + check_cxx_source_runs(" +@@ -141,8 +163,12 @@ + IF(MINIUPNPC_VERSION_PRE1_6) + message(STATUS "Found miniupnpc version is pre v1.6") + ENDIF() +- IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6) +- message(STATUS "Found miniupnpc version is v1.6 or higher") ++ IF(MINIUPNPC_VERSION_PRE1_7) ++ message(STATUS "Found miniupnpc version is pre v1.7") ++ ENDIF() ++ ++ IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7) ++ message(STATUS "Found miniupnpc version is v1.7 or higher") + ENDIF() + + else () +--- trunk/source/shared_lib/sources/platform/posix/socket.cpp 2012/12/24 18:05:13 3957 ++++ trunk/source/shared_lib/sources/platform/posix/socket.cpp 2012/12/26 01:11:11 3958 +@@ -2478,13 +2478,22 @@ + if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP device found: %s %s\n", dev->descURL, dev->st); + + //printf("UPnP device found: [%s] [%s] lanaddr [%s]\n", dev->descURL, dev->st,lanaddr); ++#ifndef MINIUPNPC_VERSION_PRE1_7 ++ descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])),0); ++#else + descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0]))); ++#endif + if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"LAN address: %s\n", lanaddr); + + if (descXML) { + parserootdesc (descXML, descXMLsize, &data); + free (descXML); descXML = 0; ++ ++#ifndef MINIUPNPC_VERSION_PRE1_7 ++ GetUPNPUrls (&urls, &data, dev->descURL,0); ++#else + GetUPNPUrls (&urls, &data, dev->descURL); ++#endif + } + snprintf(buf, 255,"UPnP device found: %s %s LAN address %s", dev->descURL, dev->st, lanaddr); + diff --git a/games-strategy/megaglest/megaglest-3.7.1.ebuild b/games-strategy/megaglest/megaglest-3.7.1.ebuild index 58873205d890..58dc3d176f03 100644 --- a/games-strategy/megaglest/megaglest-3.7.1.ebuild +++ b/games-strategy/megaglest/megaglest-3.7.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.7.1.ebuild,v 1.3 2012/12/28 11:28:19 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.7.1.ebuild,v 1.4 2013/02/12 16:58:28 hasufell Exp $ EAPI=4 VIRTUALX_REQUIRED="manual" @@ -66,7 +66,7 @@ src_prepare() { need-wxwidgets unicode fi - epatch "${FILESDIR}"/${P}-{static-build,as-needed}.patch + epatch "${FILESDIR}"/${P}-{static-build,as-needed,miniupnpc-1.8}.patch } src_configure() { |