diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-20 04:11:19 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-20 04:11:19 +0000 |
| commit | 469e7cfcfccc3041b64ccc6e15e830b65817aae9 (patch) | |
| tree | f06e03b2d9201b711190af042a8730c526017233 /community/0ad | |
| parent | afb660f06bce8338225c531b092c1c1205239072 (diff) | |
Tue May 20 04:04:22 UTC 2014
Diffstat (limited to 'community/0ad')
| -rw-r--r-- | community/0ad/PKGBUILD | 35 | ||||
| -rw-r--r-- | community/0ad/miniupnpc-1.9.patch | 12 |
2 files changed, 22 insertions, 25 deletions
diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD index fa0c32833..9fb336a89 100644 --- a/community/0ad/PKGBUILD +++ b/community/0ad/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 111146 2014-05-14 18:11:18Z svenstaro $ +# $Id: PKGBUILD 111463 2014-05-19 02:56:24Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com> # Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com> pkgname=0ad -pkgver=a15 -_pkgver=0.0.15-alpha -pkgrel=5 +pkgver=a16 +_pkgver=0.0.16-alpha +pkgrel=1 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game" arch=('i686' 'x86_64') url="http://play0ad.com/" license=('GPL2' 'CCPL') depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk2.8' 'zlib' 'libgl' '0ad-data' 'glu' - 'gloox' 'miniupnpc') + 'gloox' 'miniupnpc' 'icu' 'nspr') makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm') source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz" - "miniupnpc-1.9.patch") -md5sums=('a651d81eb9b31da01e376ddaa597e954' - 'f3d27da4944d42fcf6b4153e54dc4600') + "http://trac.wildfiregames.com/raw-attachment/ticket/2552/miniupnpc_api.patch") +md5sums=('3836bbcdf4edc57c2354b4fef6023146' + '6981595ba4b8eb21f9503304b090c9a9') prepare() { - cd "$srcdir/$pkgname-$_pkgver" - patch -p1 -i ../miniupnpc-1.9.patch + cd "$srcdir/$pkgname-$_pkgver/" + patch -p0 -i "../miniupnpc_api.patch" + sed -i "s/env python/env python2/g" libraries/source/cxxtest-4.3/bin/cxxtestgen } build() { @@ -39,15 +40,17 @@ build() { cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc" - make CONFIG=Release + make } package() { - install -d "${pkgdir}"/usr/{bin,lib/0ad} + install -d "${pkgdir}"/usr/{bin,lib/0ad,share/"${pkgname}"/data} cd "$srcdir/$pkgname-$_pkgver" install -Dm755 binaries/system/pyrogenesis "${pkgdir}/usr/bin" - install -Dm755 binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib/0ad" + install -Dm755 binaries/system/*.so "${pkgdir}/usr/lib/0ad" + + cp -r binaries/data/l10n/ ${pkgdir}/usr/share/${pkgname}/data/ install -Dm755 build/resources/${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}" install -Dm644 build/resources/${pkgname}.desktop \ @@ -55,3 +58,9 @@ package() { install -Dm644 build/resources/${pkgname}.png \ "${pkgdir}/usr/share/pixmaps/${pkgname}.png" } + +# Fails? +#check() { +# cd "$srcdir/$pkgname-$_pkgver" +# LD_LIBRARY_PATH=binaries/system binaries/system/test +#} diff --git a/community/0ad/miniupnpc-1.9.patch b/community/0ad/miniupnpc-1.9.patch deleted file mode 100644 index d0546cf2e..000000000 --- a/community/0ad/miniupnpc-1.9.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN a/source/network/NetServer.cpp b/source/network/NetServer.cpp ---- a/source/network/NetServer.cpp 2013-12-18 16:08:56.000000000 +0000 -+++ b/source/network/NetServer.cpp 2014-02-18 10:11:59.955214338 +0000 -@@ -274,7 +274,7 @@ void* CNetServerWorker::SetupUPnP(void*) - // Check that the port was actually forwarded. - ret = UPNP_GetSpecificPortMappingEntry(urls.controlURL, - data.first.servicetype, -- psPort, protocall, -+ psPort, protocall, externalIPAddress, - intClient, intPort, NULL/*desc*/, - NULL/*enabled*/, duration); - |