diff options
author | root <root@rshg054.dnsready.net> | 2012-10-23 01:37:15 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-10-23 01:37:15 -0700 |
commit | 3c19af9355ba86a5b99d6e5a57ecaa68a7ea6e8e (patch) | |
tree | 8fac31deec086251b3b9dc8faddfe14f5667392b /community-staging/megaglest | |
parent | 99746708edfd2c56f2ba654a14f27e98b1601a43 (diff) |
Tue Oct 23 01:37:02 PDT 2012
Diffstat (limited to 'community-staging/megaglest')
-rw-r--r-- | community-staging/megaglest/PKGBUILD | 41 | ||||
-rw-r--r-- | community-staging/megaglest/lol.patch | 43 |
2 files changed, 84 insertions, 0 deletions
diff --git a/community-staging/megaglest/PKGBUILD b/community-staging/megaglest/PKGBUILD new file mode 100644 index 000000000..4c51617d4 --- /dev/null +++ b/community-staging/megaglest/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 78704 2012-10-22 23:38:03Z ebelanger $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> + +pkgname=megaglest +pkgver=3.6.0.3 +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' 'lua' '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=('5a4a2429435031d9f9cc5d9535a9de9d' + '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: diff --git a/community-staging/megaglest/lol.patch b/community-staging/megaglest/lol.patch new file mode 100644 index 000000000..56f94c852 --- /dev/null +++ b/community-staging/megaglest/lol.patch @@ -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: + + Rect2<T> 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 Vec2<T> &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() |