[arch-commits] Commit in megaglest/repos (6 files)
Evangelos Foutras
foutrelis at archlinux.org
Mon Sep 28 15:48:55 UTC 2015
Date: Monday, September 28, 2015 @ 17:48:55
Author: foutrelis
Revision: 142084
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 142083, megaglest/trunk/PKGBUILD)
megaglest/repos/community-staging-i686/miniupnpc14.patch
(from rev 142083, megaglest/trunk/miniupnpc14.patch)
megaglest/repos/community-staging-x86_64/
megaglest/repos/community-staging-x86_64/PKGBUILD
(from rev 142083, megaglest/trunk/PKGBUILD)
megaglest/repos/community-staging-x86_64/miniupnpc14.patch
(from rev 142083, megaglest/trunk/miniupnpc14.patch)
--------------------------------------------+
community-staging-i686/PKGBUILD | 47 +++++++++++++++++++++++++++
community-staging-i686/miniupnpc14.patch | 22 ++++++++++++
community-staging-x86_64/PKGBUILD | 47 +++++++++++++++++++++++++++
community-staging-x86_64/miniupnpc14.patch | 22 ++++++++++++
4 files changed, 138 insertions(+)
Copied: megaglest/repos/community-staging-i686/PKGBUILD (from rev 142083, megaglest/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-09-28 15:48:55 UTC (rev 142084)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
+
+pkgname=megaglest
+pkgver=3.11.1
+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' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua51' 'icu' 'ftgl' 'glew'
+'libircclient' 'miniupnpc' 'wxgtk2.8' 'glu' 'libx11')
+makedepends=('ftjam' 'cmake' 'mesa' 'git')
+source=("git+https://github.com/MegaGlest/megaglest-source.git#tag=${pkgver}"
+ "miniupnpc14.patch")
+md5sums=('SKIP'
+ '9774a0ab4daa635d3ea7bb6d3ec9834c')
+
+prepare() {
+ cd megaglest-source
+ patch -Np1 -i ../miniupnpc14.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 \
+ -DwxWidgets_CONFIG_EXECUTABLE="/usr/bin/wx-config-2.8" \
+ -DwxWidgets_wxrc_EXECUTABLE="/usr/bin/wxrc-2.8"
+ make VERBOSE=1
+}
+
+package() {
+ cd megaglest-source/build
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim: sw=2:ts=2 et:
Copied: megaglest/repos/community-staging-i686/miniupnpc14.patch (from rev 142083, megaglest/trunk/miniupnpc14.patch)
===================================================================
--- community-staging-i686/miniupnpc14.patch (rev 0)
+++ community-staging-i686/miniupnpc14.patch 2015-09-28 15:48:55 UTC (rev 142084)
@@ -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 142083, megaglest/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-09-28 15:48:55 UTC (rev 142084)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
+
+pkgname=megaglest
+pkgver=3.11.1
+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' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua51' 'icu' 'ftgl' 'glew'
+'libircclient' 'miniupnpc' 'wxgtk2.8' 'glu' 'libx11')
+makedepends=('ftjam' 'cmake' 'mesa' 'git')
+source=("git+https://github.com/MegaGlest/megaglest-source.git#tag=${pkgver}"
+ "miniupnpc14.patch")
+md5sums=('SKIP'
+ '9774a0ab4daa635d3ea7bb6d3ec9834c')
+
+prepare() {
+ cd megaglest-source
+ patch -Np1 -i ../miniupnpc14.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 \
+ -DwxWidgets_CONFIG_EXECUTABLE="/usr/bin/wx-config-2.8" \
+ -DwxWidgets_wxrc_EXECUTABLE="/usr/bin/wxrc-2.8"
+ 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/miniupnpc14.patch (from rev 142083, megaglest/trunk/miniupnpc14.patch)
===================================================================
--- community-staging-x86_64/miniupnpc14.patch (rev 0)
+++ community-staging-x86_64/miniupnpc14.patch 2015-09-28 15:48:55 UTC (rev 142084)
@@ -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);
More information about the arch-commits
mailing list