[arch-commits] Commit in megaglest/repos (6 files)

2015-12-06 Thread Felix Yan 
Date: Monday, December 7, 2015 @ 08:19:10
  Author: fyan
Revision: 149691

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 149690, megaglest/trunk/PKGBUILD)
  megaglest/repos/community-staging-i686/miniupnpc14.patch
(from rev 149690, megaglest/trunk/miniupnpc14.patch)
  megaglest/repos/community-staging-x86_64/
  megaglest/repos/community-staging-x86_64/PKGBUILD
(from rev 149690, megaglest/trunk/PKGBUILD)
  megaglest/repos/community-staging-x86_64/miniupnpc14.patch
(from rev 149690, 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 149690, 
megaglest/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-12-07 07:19:10 UTC (rev 149691)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase 
+# Contributor: Larry Hajali 
+
+pkgname=megaglest
+pkgver=3.11.1
+pkgrel=5
+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 
149690, megaglest/trunk/miniupnpc14.patch)
===
--- community-staging-i686/miniupnpc14.patch(rev 0)
+++ community-staging-i686/miniupnpc14.patch2015-12-07 07:19:10 UTC (rev 
149691)
@@ -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, _error);
++# else
+   devlist = upnpDiscover(upnp_delay, upnp_multicastif, 
upnp_minissdpdsock, upnp_sameport, upnp_ipv6, _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 149690, 
megaglest/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2015-12-07 07:19:10 UTC (rev 149691)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase 
+# Contributor: Larry Hajali 
+
+pkgname=megaglest
+pkgver=3.11.1
+pkgrel=5
+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')

[arch-commits] Commit in megaglest/repos (6 files)

2015-10-09 Thread Levente Polyak 
Date: Friday, October 9, 2015 @ 16:40:30
  Author: anthraxx
Revision: 143504

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 143503, megaglest/trunk/PKGBUILD)
  megaglest/repos/community-staging-i686/miniupnpc14.patch
(from rev 143503, megaglest/trunk/miniupnpc14.patch)
  megaglest/repos/community-staging-x86_64/
  megaglest/repos/community-staging-x86_64/PKGBUILD
(from rev 143503, megaglest/trunk/PKGBUILD)
  megaglest/repos/community-staging-x86_64/miniupnpc14.patch
(from rev 143503, 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 143503, 
megaglest/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-10-09 14:40:30 UTC (rev 143504)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase 
+# Contributor: Larry Hajali 
+
+pkgname=megaglest
+pkgver=3.11.1
+pkgrel=4
+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 
143503, megaglest/trunk/miniupnpc14.patch)
===
--- community-staging-i686/miniupnpc14.patch(rev 0)
+++ community-staging-i686/miniupnpc14.patch2015-10-09 14:40:30 UTC (rev 
143504)
@@ -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, _error);
++# else
+   devlist = upnpDiscover(upnp_delay, upnp_multicastif, 
upnp_minissdpdsock, upnp_sameport, upnp_ipv6, _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 143503, 
megaglest/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2015-10-09 14:40:30 UTC (rev 143504)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase 
+# Contributor: Larry Hajali 
+
+pkgname=megaglest
+pkgver=3.11.1
+pkgrel=4
+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')

[arch-commits] Commit in megaglest/repos (6 files)

2015-09-28 Thread Evangelos Foutras 
Date: Monday, September 28, 2015 @ 22:01:06
  Author: foutrelis
Revision: 142137

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 142136, megaglest/trunk/PKGBUILD)
  megaglest/repos/community-staging-i686/miniupnpc14.patch
(from rev 142136, megaglest/trunk/miniupnpc14.patch)
  megaglest/repos/community-staging-x86_64/
  megaglest/repos/community-staging-x86_64/PKGBUILD
(from rev 142136, megaglest/trunk/PKGBUILD)
  megaglest/repos/community-staging-x86_64/miniupnpc14.patch
(from rev 142136, 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 142136, 
megaglest/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-09-28 20:01:06 UTC (rev 142137)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase 
+# Contributor: Larry Hajali 
+
+pkgname=megaglest
+pkgver=3.11.1
+pkgrel=3
+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 
142136, megaglest/trunk/miniupnpc14.patch)
===
--- community-staging-i686/miniupnpc14.patch(rev 0)
+++ community-staging-i686/miniupnpc14.patch2015-09-28 20:01:06 UTC (rev 
142137)
@@ -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, _error);
++# else
+   devlist = upnpDiscover(upnp_delay, upnp_multicastif, 
upnp_minissdpdsock, upnp_sameport, upnp_ipv6, _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 142136, 
megaglest/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2015-09-28 20:01:06 UTC (rev 142137)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase 
+# Contributor: Larry Hajali 
+
+pkgname=megaglest
+pkgver=3.11.1
+pkgrel=3
+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')

[arch-commits] Commit in megaglest/repos (6 files)

2015-09-28 Thread Evangelos Foutras 
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 
+# Contributor: Larry Hajali 
+
+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.patch2015-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, _error);
++# else
+   devlist = upnpDiscover(upnp_delay, upnp_multicastif, 
upnp_minissdpdsock, upnp_sameport, upnp_ipv6, _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 
+# Contributor: Larry Hajali 
+
+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')

[arch-commits] Commit in megaglest/repos (6 files)

2013-06-26 Thread Sven-Hendrik Haase 
Date: Wednesday, June 26, 2013 @ 19:55:13
  Author: svenstaro
Revision: 93166

archrelease: copy trunk to community-i686, community-x86_64

Added:
  megaglest/repos/community-i686/PKGBUILD
(from rev 93165, megaglest/trunk/PKGBUILD)
  megaglest/repos/community-x86_64/PKGBUILD
(from rev 93165, megaglest/trunk/PKGBUILD)
Deleted:
  megaglest/repos/community-i686/PKGBUILD
  megaglest/repos/community-i686/lol.patch
  megaglest/repos/community-x86_64/PKGBUILD
  megaglest/repos/community-x86_64/lol.patch

+
 /PKGBUILD  |   78 +++
 community-i686/PKGBUILD|   41 --
 community-i686/lol.patch   |   43 ---
 community-x86_64/PKGBUILD  |   41 --
 community-x86_64/lol.patch |   43 ---
 5 files changed, 78 insertions(+), 168 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2013-06-26 17:53:31 UTC (rev 93165)
+++ community-i686/PKGBUILD 2013-06-26 17:55:13 UTC (rev 93166)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com
-# Contributor: Larry Hajali larryhaja [at] gmail [dot] com
-
-pkgname=megaglest
-pkgver=3.7.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' 'wxgtk' 'glu')
-makedepends=('ftjam' 'cmake' 'mesa')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz;
-lol.patch)
-md5sums=('e7a960ec73784aa0f7b951d2ad963456'
- '68fd326b73ed1c75981004fbdef6b73a')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}/
-
-  #patch -Np1  $srcdir/lol.patch
-
-  [[ -d build ]]  rm -r build
-  mkdir build  cd build
-  cmake .. \
--DWANT_SVN_STAMP=OFF \
--DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}/
-
-  cd build
-  make DESTDIR=$pkgdir install
-}
-
-# vim: sw=2:ts=2 et:

Copied: megaglest/repos/community-i686/PKGBUILD (from rev 93165, 
megaglest/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-06-26 17:55:13 UTC (rev 93166)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com
+# Contributor: Larry Hajali larryhaja [at] gmail [dot] com
+
+pkgname=megaglest
+pkgver=3.8.0beta1
+_pkgver=3.8.0-beta1
+pkgrel=1
+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' 'wxgtk' 'glu')
+makedepends=('ftjam' 'cmake' 'mesa')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${_pkgver}.tar.xz;)
+md5sums=('1da8707d435ffb2342f03ca466d4eeed')
+
+build() {
+  cd ${srcdir}/${pkgname}-${_pkgver}/
+
+  [[ -d build ]]  rm -r build
+  mkdir build  cd build
+
+  cmake .. \
+-DWANT_SVN_STAMP=OFF \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${_pkgver}/
+
+  cd build
+  make DESTDIR=$pkgdir install
+}
+
+# vim: sw=2:ts=2 et:

Deleted: community-i686/lol.patch
===
--- community-i686/lol.patch2013-06-26 17:53:31 UTC (rev 93165)
+++ community-i686/lol.patch2013-06-26 17:55:13 UTC (rev 93166)
@@ -1,43 +0,0 @@
-diff --git a/source/shared_lib/include/graphics/math_util.h 
b/source/shared_lib/include/graphics/math_util.h
-index 8fcfb27..3cb7a41 100644
 a/source/shared_lib/include/graphics/math_util.h
-+++ b/source/shared_lib/include/graphics/math_util.h
-@@ -184,10 +184,10 @@ public:
- 
-   Rect2T computeBoundingRect() const{
-   return Rect2i(
--  min(p[0].x, p[1].x), 
--  min(p[0].y, p[2].y), 
--  max(p[2].x, p[3].x), 
--  max(p[1].y, p[3].y));
-+  std::min(p[0].x, p[1].x),
-+  std::min(p[0].y, p[2].y),
-+  std::max(p[2].x, p[3].x),
-+  std::max(p[1].y, p[3].y));
-   }
- 
-   bool isInside(const Vec2T pt) const{
-diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp 
b/source/shared_lib/sources/platform/posix/ircclient.cpp
-index b09c972..ddebd03 100644
 a/source/shared_lib/sources/platform/posix/ircclient.cpp
-+++

[arch-commits] Commit in megaglest/repos (6 files)

2013-04-28 Thread Sven-Hendrik Haase 
Date: Sunday, April 28, 2013 @ 21:23:31
  Author: svenstaro
Revision: 89352

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 89351, megaglest/trunk/PKGBUILD)
  megaglest/repos/community-staging-i686/lol.patch
(from rev 89351, megaglest/trunk/lol.patch)
  megaglest/repos/community-staging-x86_64/
  megaglest/repos/community-staging-x86_64/PKGBUILD
(from rev 89351, megaglest/trunk/PKGBUILD)
  megaglest/repos/community-staging-x86_64/lol.patch
(from rev 89351, megaglest/trunk/lol.patch)

+
 community-staging-i686/PKGBUILD|   41 +
 community-staging-i686/lol.patch   |   43 +++
 community-staging-x86_64/PKGBUILD  |   41 +
 community-staging-x86_64/lol.patch |   43 +++
 4 files changed, 168 insertions(+)

Copied: megaglest/repos/community-staging-i686/PKGBUILD (from rev 89351, 
megaglest/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-04-28 19:23:31 UTC (rev 89352)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com
+# Contributor: Larry Hajali larryhaja [at] gmail [dot] com
+
+pkgname=megaglest
+pkgver=3.7.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' 'wxgtk' 'glu')
+makedepends=('ftjam' 'cmake' 'mesa')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz;
+lol.patch)
+md5sums=('e7a960ec73784aa0f7b951d2ad963456'
+ '68fd326b73ed1c75981004fbdef6b73a')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}/
+
+  #patch -Np1  $srcdir/lol.patch
+
+  [[ -d build ]]  rm -r build
+  mkdir build  cd build
+  cmake .. \
+-DWANT_SVN_STAMP=OFF \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}/
+
+  cd build
+  make DESTDIR=$pkgdir install
+}
+
+# vim: sw=2:ts=2 et:

Copied: megaglest/repos/community-staging-i686/lol.patch (from rev 89351, 
megaglest/trunk/lol.patch)
===
--- community-staging-i686/lol.patch(rev 0)
+++ community-staging-i686/lol.patch2013-04-28 19:23:31 UTC (rev 89352)
@@ -0,0 +1,43 @@
+diff --git a/source/shared_lib/include/graphics/math_util.h 
b/source/shared_lib/include/graphics/math_util.h
+index 8fcfb27..3cb7a41 100644
+--- a/source/shared_lib/include/graphics/math_util.h
 b/source/shared_lib/include/graphics/math_util.h
+@@ -184,10 +184,10 @@ public:
+ 
+   Rect2T computeBoundingRect() const{
+   return Rect2i(
+-  min(p[0].x, p[1].x), 
+-  min(p[0].y, p[2].y), 
+-  max(p[2].x, p[3].x), 
+-  max(p[1].y, p[3].y));
++  std::min(p[0].x, p[1].x),
++  std::min(p[0].y, p[2].y),
++  std::max(p[2].x, p[3].x),
++  std::max(p[1].y, p[3].y));
+   }
+ 
+   bool isInside(const Vec2T pt) const{
+diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp 
b/source/shared_lib/sources/platform/posix/ircclient.cpp
+index b09c972..ddebd03 100644
+--- a/source/shared_lib/sources/platform/posix/ircclient.cpp
 b/source/shared_lib/sources/platform/posix/ircclient.cpp
+@@ -13,6 +13,7 @@
+ #include ircclient.h
+ #include util.h
+ #include platform_common.h
++#include libirc_rfcnumeric.h
+ #include libircclient.h
+ 
+ #include stdio.h
+diff --git a/source/shared_lib/sources/util/util.cpp 
b/source/shared_lib/sources/util/util.cpp
+index 05478fc..c27aa62 100644
+--- a/source/shared_lib/sources/util/util.cpp
 b/source/shared_lib/sources/util/util.cpp
+@@ -19,6 +19,7 @@
+ #include stdarg.h
+ #include time.h
+ #include fcntl.h // for open()
++#include unistd.h
+ 
+ #ifdef WIN32
+   #include io.h // for open()

Copied: megaglest/repos/community-staging-x86_64/PKGBUILD (from rev 89351, 
megaglest/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2013-04-28 19:23:31 UTC (rev 89352)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com
+# Contributor: Larry Hajali larryhaja [at] gmail [dot] com
+
+pkgname=megaglest
+pkgver=3.7.1
+pkgrel=2