Date: Sunday, November 13, 2016 @ 00:05:56 Author: svenstaro Revision: 195482
archrelease: copy trunk to community-i686, community-x86_64 Added: 0ad/repos/community-i686/PKGBUILD (from rev 195481, 0ad/trunk/PKGBUILD) 0ad/repos/community-x86_64/PKGBUILD (from rev 195481, 0ad/trunk/PKGBUILD) Deleted: 0ad/repos/community-i686/0ad-gcc6.patch 0ad/repos/community-i686/PKGBUILD 0ad/repos/community-x86_64/0ad-gcc6.patch 0ad/repos/community-x86_64/PKGBUILD ---------------------------------+ /PKGBUILD | 120 ++++++++++++++++++++++++++++++++++++++ community-i686/0ad-gcc6.patch | 31 --------- community-i686/PKGBUILD | 64 -------------------- community-x86_64/0ad-gcc6.patch | 31 --------- community-x86_64/PKGBUILD | 64 -------------------- 5 files changed, 120 insertions(+), 190 deletions(-) Deleted: community-i686/0ad-gcc6.patch =================================================================== --- community-i686/0ad-gcc6.patch 2016-11-13 00:05:21 UTC (rev 195481) +++ community-i686/0ad-gcc6.patch 2016-11-13 00:05:56 UTC (rev 195482) @@ -1,31 +0,0 @@ -Index: libraries/source/nvtt/src/src/nvimage/ImageIO.cpp -=================================================================== ---- libraries/source/nvtt/src/src/nvimage/ImageIO.cpp (revision 18164) -+++ libraries/source/nvtt/src/src/nvimage/ImageIO.cpp (working copy) -@@ -621,7 +621,7 @@ - png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if (png_ptr == NULL) { - // nvDebug( "*** LoadPNG: Error allocating read buffer in file '%s'.\n", name ); -- return false; -+ return NULL; - } - - // Allocate/initialize a memory block for the image information -@@ -629,7 +629,7 @@ - if (info_ptr == NULL) { - png_destroy_read_struct(&png_ptr, NULL, NULL); - // nvDebug( "*** LoadPNG: Error allocating image information for '%s'.\n", name ); -- return false; -+ return NULL; - } - - // Set up the error handling -@@ -636,7 +636,7 @@ - if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - // nvDebug( "*** LoadPNG: Error reading png file '%s'.\n", name ); -- return false; -+ return NULL; - } - - // Set up the I/O functions. Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-11-13 00:05:21 UTC (rev 195481) +++ community-i686/PKGBUILD 2016-11-13 00:05:56 UTC (rev 195482) @@ -1,64 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com> -# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyeticha...@gmail.com> -pkgname=0ad -pkgver=a20 -_pkgver=0.0.20-alpha -pkgrel=10 -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' 'sdl2' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu' - 'gloox' 'miniupnpc' 'icu' 'nspr') -makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm') -source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz" 0ad-gcc6.patch) -md5sums=('3218564020a07ce905a3db84476a3408' - '0b28aaa15e8a709ffd00e22aad69b6aa') - -prepare() { - cd "$srcdir/$pkgname-$_pkgver/" - sed -i "s/env python/env python2/g" libraries/source/cxxtest-4.4/bin/cxxtestgen - - # Fix build with GCC 6 - patch -p0 -i ../0ad-gcc6.patch -} - -build() { - cd "$srcdir/$pkgname-$_pkgver/build/workspaces" - - unset CPPFLAGS # for le spidermonkey - - ./update-workspaces.sh \ - --bindir=/usr/bin \ - --libdir=/usr/lib/0ad \ - --datadir=/usr/share/${pkgname}/data - - cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc" - - make -} - -package() { - 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 "${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 \ - "${pkgdir}/usr/share/applications/${pkgname}.desktop" - 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 -#} Copied: 0ad/repos/community-i686/PKGBUILD (from rev 195481, 0ad/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-11-13 00:05:56 UTC (rev 195482) @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com> +# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyeticha...@gmail.com> +pkgname=0ad +pkgver=a21 +_pkgver=0.0.21-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' 'sdl2' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu' + 'gloox' 'miniupnpc' 'icu' 'nspr') +makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm') +source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz") +md5sums=('095eade8c9b3deaf25d0d7fa423ff860') + +prepare() { + cd "$srcdir/$pkgname-$_pkgver/" + sed -i "s/env python/env python2/g" libraries/source/cxxtest-4.4/bin/cxxtestgen +} + +build() { + cd "$srcdir/$pkgname-$_pkgver/build/workspaces" + + unset CPPFLAGS # for le spidermonkey + + ./update-workspaces.sh \ + --bindir=/usr/bin \ + --libdir=/usr/lib/0ad \ + --datadir=/usr/share/${pkgname}/data + + cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc" + + make +} + +package() { + 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 "${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 \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" + 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 +#} Deleted: community-x86_64/0ad-gcc6.patch =================================================================== --- community-x86_64/0ad-gcc6.patch 2016-11-13 00:05:21 UTC (rev 195481) +++ community-x86_64/0ad-gcc6.patch 2016-11-13 00:05:56 UTC (rev 195482) @@ -1,31 +0,0 @@ -Index: libraries/source/nvtt/src/src/nvimage/ImageIO.cpp -=================================================================== ---- libraries/source/nvtt/src/src/nvimage/ImageIO.cpp (revision 18164) -+++ libraries/source/nvtt/src/src/nvimage/ImageIO.cpp (working copy) -@@ -621,7 +621,7 @@ - png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if (png_ptr == NULL) { - // nvDebug( "*** LoadPNG: Error allocating read buffer in file '%s'.\n", name ); -- return false; -+ return NULL; - } - - // Allocate/initialize a memory block for the image information -@@ -629,7 +629,7 @@ - if (info_ptr == NULL) { - png_destroy_read_struct(&png_ptr, NULL, NULL); - // nvDebug( "*** LoadPNG: Error allocating image information for '%s'.\n", name ); -- return false; -+ return NULL; - } - - // Set up the error handling -@@ -636,7 +636,7 @@ - if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - // nvDebug( "*** LoadPNG: Error reading png file '%s'.\n", name ); -- return false; -+ return NULL; - } - - // Set up the I/O functions. Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-11-13 00:05:21 UTC (rev 195481) +++ community-x86_64/PKGBUILD 2016-11-13 00:05:56 UTC (rev 195482) @@ -1,64 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com> -# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyeticha...@gmail.com> -pkgname=0ad -pkgver=a20 -_pkgver=0.0.20-alpha -pkgrel=10 -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' 'sdl2' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu' - 'gloox' 'miniupnpc' 'icu' 'nspr') -makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm') -source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz" 0ad-gcc6.patch) -md5sums=('3218564020a07ce905a3db84476a3408' - '0b28aaa15e8a709ffd00e22aad69b6aa') - -prepare() { - cd "$srcdir/$pkgname-$_pkgver/" - sed -i "s/env python/env python2/g" libraries/source/cxxtest-4.4/bin/cxxtestgen - - # Fix build with GCC 6 - patch -p0 -i ../0ad-gcc6.patch -} - -build() { - cd "$srcdir/$pkgname-$_pkgver/build/workspaces" - - unset CPPFLAGS # for le spidermonkey - - ./update-workspaces.sh \ - --bindir=/usr/bin \ - --libdir=/usr/lib/0ad \ - --datadir=/usr/share/${pkgname}/data - - cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc" - - make -} - -package() { - 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 "${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 \ - "${pkgdir}/usr/share/applications/${pkgname}.desktop" - 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 -#} Copied: 0ad/repos/community-x86_64/PKGBUILD (from rev 195481, 0ad/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-11-13 00:05:56 UTC (rev 195482) @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com> +# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyeticha...@gmail.com> +pkgname=0ad +pkgver=a21 +_pkgver=0.0.21-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' 'sdl2' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu' + 'gloox' 'miniupnpc' 'icu' 'nspr') +makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm') +source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz") +md5sums=('095eade8c9b3deaf25d0d7fa423ff860') + +prepare() { + cd "$srcdir/$pkgname-$_pkgver/" + sed -i "s/env python/env python2/g" libraries/source/cxxtest-4.4/bin/cxxtestgen +} + +build() { + cd "$srcdir/$pkgname-$_pkgver/build/workspaces" + + unset CPPFLAGS # for le spidermonkey + + ./update-workspaces.sh \ + --bindir=/usr/bin \ + --libdir=/usr/lib/0ad \ + --datadir=/usr/share/${pkgname}/data + + cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc" + + make +} + +package() { + 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 "${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 \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" + 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 +#}