Date: Thursday, August 4, 2016 @ 18:06:38
Author: arojas
Revision: 185081
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
megaglest/repos/community-staging-i686/
megaglest/repos/community-staging-i686/PKGBUILD
(from rev 185080, megaglest/trunk/PKGBUILD)
megaglest/repos/community-staging-i686/megaglest-gcc6.patch
(from rev 185080, megaglest/trunk/megaglest-gcc6.patch)
megaglest/repos/community-staging-i686/megaglest-miniupnpc2.patch
(from rev 185080, megaglest/trunk/megaglest-miniupnpc2.patch)
megaglest/repos/community-staging-i686/miniupnpc14.patch
(from rev 185080, megaglest/trunk/miniupnpc14.patch)
megaglest/repos/community-staging-x86_64/
megaglest/repos/community-staging-x86_64/PKGBUILD
(from rev 185080, megaglest/trunk/PKGBUILD)
megaglest/repos/community-staging-x86_64/megaglest-gcc6.patch
(from rev 185080, megaglest/trunk/megaglest-gcc6.patch)
megaglest/repos/community-staging-x86_64/megaglest-miniupnpc2.patch
(from rev 185080, megaglest/trunk/megaglest-miniupnpc2.patch)
megaglest/repos/community-staging-x86_64/miniupnpc14.patch
(from rev 185080, megaglest/trunk/miniupnpc14.patch)
-----------------------------------------------------+
community-staging-i686/PKGBUILD | 48 ++++++++++++++++++
community-staging-i686/megaglest-gcc6.patch | 13 ++++
community-staging-i686/megaglest-miniupnpc2.patch | 14 +++++
community-staging-i686/miniupnpc14.patch | 22 ++++++++
community-staging-x86_64/PKGBUILD | 48 ++++++++++++++++++
community-staging-x86_64/megaglest-gcc6.patch | 13 ++++
community-staging-x86_64/megaglest-miniupnpc2.patch | 14 +++++
community-staging-x86_64/miniupnpc14.patch | 22 ++++++++
8 files changed, 194 insertions(+)
Copied: megaglest/repos/community-staging-i686/PKGBUILD (from rev 185080,
megaglest/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-08-04 18:06:38 UTC (rev 185081)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <[email protected]>
+# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
+
+pkgname=megaglest
+pkgver=3.12.0
+pkgrel=2
+pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/megaglest/";
+license=('GPL3')
+depends=('curl' 'megaglest-data' 'xerces-c' 'sdl2' 'libvorbis' 'openal'
'libgl' 'lua51' 'icu' 'ftgl' 'glew'
+'libircclient' 'miniupnpc' 'wxgtk' 'glu' 'libx11')
+makedepends=('ftjam' 'cmake' 'mesa' 'git')
+source=("git+https://github.com/MegaGlest/megaglest-source.git#tag=${pkgver}";
megaglest-gcc6.patch megaglest-miniupnpc2.patch)
+md5sums=('SKIP'
+ 'da91416d9e8e7a2ec0dde379474ecf6a'
+ '98259043b47888d0f5e2308539c07057')
+
+prepare() {
+ cd megaglest-source
+ # Fix build with GCC 6 (Fedora)
+ patch -p1 -i ../megaglest-gcc6.patch
+ # Fix build with miniupnpc 2 (Fedora)
+ patch -p1 -i ../megaglest-miniupnpc2.patch
+}
+
+build() {
+ cd megaglest-source
+
+ [[ -d build ]] && rm -r build
+ mkdir build && cd build
+
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_CXX_FLAGS="-lX11" \
+ -DWANT_GIT_STAMP=0
+ make VERBOSE=1
+}
+
+package() {
+ cd megaglest-source/build
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim: sw=2:ts=2 et:
Copied: megaglest/repos/community-staging-i686/megaglest-gcc6.patch (from rev
185080, megaglest/trunk/megaglest-gcc6.patch)
===================================================================
--- community-staging-i686/megaglest-gcc6.patch (rev 0)
+++ community-staging-i686/megaglest-gcc6.patch 2016-08-04 18:06:38 UTC (rev
185081)
@@ -0,0 +1,13 @@
+diff -up
megaglest-3.12.0/source/shared_lib/sources/platform/common/platform_common.cpp.orig
megaglest-3.12.0/source/shared_lib/sources/platform/common/platform_common.cpp
+---
megaglest-3.12.0/source/shared_lib/sources/platform/common/platform_common.cpp.orig
2016-06-24 07:56:09.496569134 -0300
++++
megaglest-3.12.0/source/shared_lib/sources/platform/common/platform_common.cpp
2016-06-24 07:56:11.962569290 -0300
+@@ -124,8 +124,7 @@ tm threadsafe_localtime(const time_t &ti
+ // extracting std::time_t from std:chrono for "now"
+ time_t systemtime_now() {
+ #if __cplusplus > 199711L
+- system_time_point system_now = std::chrono::system_clock::now();
+- return std::chrono::system_clock::to_time_t(system_now);
++ return
std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+ #else
+ return time(NULL);
+ #endif
Copied: megaglest/repos/community-staging-i686/megaglest-miniupnpc2.patch (from
rev 185080, megaglest/trunk/megaglest-miniupnpc2.patch)
===================================================================
--- community-staging-i686/megaglest-miniupnpc2.patch
(rev 0)
+++ community-staging-i686/megaglest-miniupnpc2.patch 2016-08-04 18:06:38 UTC
(rev 185081)
@@ -0,0 +1,14 @@
+diff -up
megaglest-3.12.0/source/shared_lib/sources/platform/posix/socket.cpp.orig
megaglest-3.12.0/source/shared_lib/sources/platform/posix/socket.cpp
+--- megaglest-3.12.0/source/shared_lib/sources/platform/posix/socket.cpp.orig
2016-06-24 08:00:27.521585488 -0300
++++ megaglest-3.12.0/source/shared_lib/sources/platform/posix/socket.cpp
2016-06-24 08:00:43.947586530 -0300
+@@ -2631,7 +2631,9 @@ int UPNP_Tools::upnp_init(void *param) {
+ 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);
+-#if (defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 9) ||
(!defined(MINIUPNPC_VERSION_PRE1_7) && !defined(MINIUPNPC_VERSION_PRE1_6))
++#if (defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 16)
++ char *descXML = (char
*)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) /
sizeof(lanaddr[0])), 0, NULL);
++#elif (defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 9) ||
(!defined(MINIUPNPC_VERSION_PRE1_7) && !defined(MINIUPNPC_VERSION_PRE1_6))
+ char *descXML = (char
*)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) /
sizeof(lanaddr[0])),0);
+ #else
+ char *descXML = (char
*)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) /
sizeof(lanaddr[0])));
Copied: megaglest/repos/community-staging-i686/miniupnpc14.patch (from rev
185080, megaglest/trunk/miniupnpc14.patch)
===================================================================
--- community-staging-i686/miniupnpc14.patch (rev 0)
+++ community-staging-i686/miniupnpc14.patch 2016-08-04 18:06:38 UTC (rev
185081)
@@ -0,0 +1,22 @@
+diff --git a/source/shared_lib/sources/platform/posix/socket.cpp
b/source/shared_lib/sources/platform/posix/socket.cpp
+index a5d4b92..4cac74f 100644
+--- a/source/shared_lib/sources/platform/posix/socket.cpp
++++ b/source/shared_lib/sources/platform/posix/socket.cpp
+@@ -2563,10 +2563,17 @@ int UPNP_Tools::upnp_init(void *param) {
+ const char *upnp_minissdpdsock = NULL;
+ int upnp_sameport = 0;
+ int upnp_ipv6 = 0;
++#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 14
++ unsigned char upnp_ttl = 2;
++#endif
+ int upnp_error = 0;
+
+ #ifndef MINIUPNPC_VERSION_PRE1_6
++# if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 14
++ devlist = upnpDiscover(upnp_delay, upnp_multicastif,
upnp_minissdpdsock, upnp_sameport, upnp_ipv6, upnp_ttl, &upnp_error);
++# else
+ devlist = upnpDiscover(upnp_delay, upnp_multicastif,
upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
++# endif
+
+
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);
Copied: megaglest/repos/community-staging-x86_64/PKGBUILD (from rev 185080,
megaglest/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2016-08-04 18:06:38 UTC (rev 185081)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <[email protected]>
+# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
+
+pkgname=megaglest
+pkgver=3.12.0
+pkgrel=2
+pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/megaglest/";
+license=('GPL3')
+depends=('curl' 'megaglest-data' 'xerces-c' 'sdl2' 'libvorbis' 'openal'
'libgl' 'lua51' 'icu' 'ftgl' 'glew'
+'libircclient' 'miniupnpc' 'wxgtk' 'glu' 'libx11')
+makedepends=('ftjam' 'cmake' 'mesa' 'git')
+source=("git+https://github.com/MegaGlest/megaglest-source.git#tag=${pkgver}";
megaglest-gcc6.patch megaglest-miniupnpc2.patch)
+md5sums=('SKIP'
+ 'da91416d9e8e7a2ec0dde379474ecf6a'
+ '98259043b47888d0f5e2308539c07057')
+
+prepare() {
+ cd megaglest-source
+ # Fix build with GCC 6 (Fedora)
+ patch -p1 -i ../megaglest-gcc6.patch
+ # Fix build with miniupnpc 2 (Fedora)
+ patch -p1 -i ../megaglest-miniupnpc2.patch
+}
+
+build() {
+ cd megaglest-source
+
+ [[ -d build ]] && rm -r build
+ mkdir build && cd build
+
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_CXX_FLAGS="-lX11" \
+ -DWANT_GIT_STAMP=0
+ make VERBOSE=1
+}
+
+package() {
+ cd megaglest-source/build
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim: sw=2:ts=2 et:
Copied: megaglest/repos/community-staging-x86_64/megaglest-gcc6.patch (from rev
185080, megaglest/trunk/megaglest-gcc6.patch)
===================================================================
--- community-staging-x86_64/megaglest-gcc6.patch
(rev 0)
+++ community-staging-x86_64/megaglest-gcc6.patch 2016-08-04 18:06:38 UTC
(rev 185081)
@@ -0,0 +1,13 @@
+diff -up
megaglest-3.12.0/source/shared_lib/sources/platform/common/platform_common.cpp.orig
megaglest-3.12.0/source/shared_lib/sources/platform/common/platform_common.cpp
+---
megaglest-3.12.0/source/shared_lib/sources/platform/common/platform_common.cpp.orig
2016-06-24 07:56:09.496569134 -0300
++++
megaglest-3.12.0/source/shared_lib/sources/platform/common/platform_common.cpp
2016-06-24 07:56:11.962569290 -0300
+@@ -124,8 +124,7 @@ tm threadsafe_localtime(const time_t &ti
+ // extracting std::time_t from std:chrono for "now"
+ time_t systemtime_now() {
+ #if __cplusplus > 199711L
+- system_time_point system_now = std::chrono::system_clock::now();
+- return std::chrono::system_clock::to_time_t(system_now);
++ return
std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+ #else
+ return time(NULL);
+ #endif
Copied: megaglest/repos/community-staging-x86_64/megaglest-miniupnpc2.patch
(from rev 185080, megaglest/trunk/megaglest-miniupnpc2.patch)
===================================================================
--- community-staging-x86_64/megaglest-miniupnpc2.patch
(rev 0)
+++ community-staging-x86_64/megaglest-miniupnpc2.patch 2016-08-04 18:06:38 UTC
(rev 185081)
@@ -0,0 +1,14 @@
+diff -up
megaglest-3.12.0/source/shared_lib/sources/platform/posix/socket.cpp.orig
megaglest-3.12.0/source/shared_lib/sources/platform/posix/socket.cpp
+--- megaglest-3.12.0/source/shared_lib/sources/platform/posix/socket.cpp.orig
2016-06-24 08:00:27.521585488 -0300
++++ megaglest-3.12.0/source/shared_lib/sources/platform/posix/socket.cpp
2016-06-24 08:00:43.947586530 -0300
+@@ -2631,7 +2631,9 @@ int UPNP_Tools::upnp_init(void *param) {
+ 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);
+-#if (defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 9) ||
(!defined(MINIUPNPC_VERSION_PRE1_7) && !defined(MINIUPNPC_VERSION_PRE1_6))
++#if (defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 16)
++ char *descXML = (char
*)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) /
sizeof(lanaddr[0])), 0, NULL);
++#elif (defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 9) ||
(!defined(MINIUPNPC_VERSION_PRE1_7) && !defined(MINIUPNPC_VERSION_PRE1_6))
+ char *descXML = (char
*)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) /
sizeof(lanaddr[0])),0);
+ #else
+ char *descXML = (char
*)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) /
sizeof(lanaddr[0])));
Copied: megaglest/repos/community-staging-x86_64/miniupnpc14.patch (from rev
185080, megaglest/trunk/miniupnpc14.patch)
===================================================================
--- community-staging-x86_64/miniupnpc14.patch (rev 0)
+++ community-staging-x86_64/miniupnpc14.patch 2016-08-04 18:06:38 UTC (rev
185081)
@@ -0,0 +1,22 @@
+diff --git a/source/shared_lib/sources/platform/posix/socket.cpp
b/source/shared_lib/sources/platform/posix/socket.cpp
+index a5d4b92..4cac74f 100644
+--- a/source/shared_lib/sources/platform/posix/socket.cpp
++++ b/source/shared_lib/sources/platform/posix/socket.cpp
+@@ -2563,10 +2563,17 @@ int UPNP_Tools::upnp_init(void *param) {
+ const char *upnp_minissdpdsock = NULL;
+ int upnp_sameport = 0;
+ int upnp_ipv6 = 0;
++#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 14
++ unsigned char upnp_ttl = 2;
++#endif
+ int upnp_error = 0;
+
+ #ifndef MINIUPNPC_VERSION_PRE1_6
++# if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 14
++ devlist = upnpDiscover(upnp_delay, upnp_multicastif,
upnp_minissdpdsock, upnp_sameport, upnp_ipv6, upnp_ttl, &upnp_error);
++# else
+ devlist = upnpDiscover(upnp_delay, upnp_multicastif,
upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
++# endif
+
+
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);
