[arch-commits] Commit in spring/repos (8 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Sat Aug 16 10:50:32 UTC 2014
Date: Saturday, August 16, 2014 @ 12:50:32
Author: svenstaro
Revision: 117452
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
spring/repos/community-staging-i686/
spring/repos/community-staging-i686/PKGBUILD
(from rev 117451, spring/trunk/PKGBUILD)
spring/repos/community-staging-i686/optional.patch
(from rev 117451, spring/trunk/optional.patch)
spring/repos/community-staging-i686/spring.install
(from rev 117451, spring/trunk/spring.install)
spring/repos/community-staging-x86_64/
spring/repos/community-staging-x86_64/PKGBUILD
(from rev 117451, spring/trunk/PKGBUILD)
spring/repos/community-staging-x86_64/optional.patch
(from rev 117451, spring/trunk/optional.patch)
spring/repos/community-staging-x86_64/spring.install
(from rev 117451, spring/trunk/spring.install)
-----------------------------------------+
community-staging-i686/PKGBUILD | 48 ++++++++++++++++++++++++++++++
community-staging-i686/optional.patch | 19 +++++++++++
community-staging-i686/spring.install | 12 +++++++
community-staging-x86_64/PKGBUILD | 48 ++++++++++++++++++++++++++++++
community-staging-x86_64/optional.patch | 19 +++++++++++
community-staging-x86_64/spring.install | 12 +++++++
6 files changed, 158 insertions(+)
Copied: spring/repos/community-staging-i686/PKGBUILD (from rev 117451, spring/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2014-08-16 10:50:32 UTC (rev 117452)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=spring
+pkgver=97.0
+pkgrel=2
+pkgdesc='A free 3D real-time-strategy (RTS) game engine'
+arch=('i686' 'x86_64')
+url="http://springrts.com/"
+license=('GPL')
+depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl2'
+ 'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils' 'libx11')
+makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment' 'mesa')
+optdepends=('python2: python-based bots'
+ 'java-runtime: java-based bots')
+install=spring.install
+source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
+ optional.patch)
+md5sums=('cf37518379c2a3a8c3c9cd689ee9b034'
+ 'd7904319b17c32299b44594ccb6ff4ea')
+
+build() {
+ bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
+
+ cd spring_${pkgver}
+
+ sed -i "/ory(test)/d" tools/unitsync/CMakeLists.txt
+ patch -Np1 < $srcdir/optional.patch
+
+ cmake . \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DDATADIR=share/spring \
+ -DCMAKE_SKIP_RPATH=YES
+ make
+}
+
+package() {
+ cd spring_${pkgver}
+
+ make DESTDIR="$pkgdir" install
+
+ install -d "$pkgdir/etc/spring"
+ echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir"
+}
+
+# vim sw=2:ts=2 et:
Copied: spring/repos/community-staging-i686/optional.patch (from rev 117451, spring/trunk/optional.patch)
===================================================================
--- community-staging-i686/optional.patch (rev 0)
+++ community-staging-i686/optional.patch 2014-08-16 10:50:32 UTC (rev 117452)
@@ -0,0 +1,19 @@
+diff --git a/rts/System/ThreadPool.cpp b/rts/System/ThreadPool.cpp
+index 0ce4b11..34e53ab 100644
+--- a/rts/System/ThreadPool.cpp
++++ b/rts/System/ThreadPool.cpp
+@@ -136,12 +136,11 @@ static bool DoTask(boost::shared_lock<boost::shared_mutex>& lk_)
+ static bool DoTask(std::shared_ptr<ITaskGroup> tg)
+ {
+ auto p = tg->GetTask();
+- const bool f = p;
+- if (f) {
++ if (p) {
+ SCOPED_MT_TIMER("::ThreadWorkers (accumulated)");
+ (*p)();
+ }
+- return f;
++ return static_cast<bool>(p);
+ }
+
+
Copied: spring/repos/community-staging-i686/spring.install (from rev 117451, spring/trunk/spring.install)
===================================================================
--- community-staging-i686/spring.install (rev 0)
+++ community-staging-i686/spring.install 2014-08-16 10:50:32 UTC (rev 117452)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Copied: spring/repos/community-staging-x86_64/PKGBUILD (from rev 117451, spring/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2014-08-16 10:50:32 UTC (rev 117452)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=spring
+pkgver=97.0
+pkgrel=2
+pkgdesc='A free 3D real-time-strategy (RTS) game engine'
+arch=('i686' 'x86_64')
+url="http://springrts.com/"
+license=('GPL')
+depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl2'
+ 'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils' 'libx11')
+makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment' 'mesa')
+optdepends=('python2: python-based bots'
+ 'java-runtime: java-based bots')
+install=spring.install
+source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
+ optional.patch)
+md5sums=('cf37518379c2a3a8c3c9cd689ee9b034'
+ 'd7904319b17c32299b44594ccb6ff4ea')
+
+build() {
+ bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
+
+ cd spring_${pkgver}
+
+ sed -i "/ory(test)/d" tools/unitsync/CMakeLists.txt
+ patch -Np1 < $srcdir/optional.patch
+
+ cmake . \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DDATADIR=share/spring \
+ -DCMAKE_SKIP_RPATH=YES
+ make
+}
+
+package() {
+ cd spring_${pkgver}
+
+ make DESTDIR="$pkgdir" install
+
+ install -d "$pkgdir/etc/spring"
+ echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir"
+}
+
+# vim sw=2:ts=2 et:
Copied: spring/repos/community-staging-x86_64/optional.patch (from rev 117451, spring/trunk/optional.patch)
===================================================================
--- community-staging-x86_64/optional.patch (rev 0)
+++ community-staging-x86_64/optional.patch 2014-08-16 10:50:32 UTC (rev 117452)
@@ -0,0 +1,19 @@
+diff --git a/rts/System/ThreadPool.cpp b/rts/System/ThreadPool.cpp
+index 0ce4b11..34e53ab 100644
+--- a/rts/System/ThreadPool.cpp
++++ b/rts/System/ThreadPool.cpp
+@@ -136,12 +136,11 @@ static bool DoTask(boost::shared_lock<boost::shared_mutex>& lk_)
+ static bool DoTask(std::shared_ptr<ITaskGroup> tg)
+ {
+ auto p = tg->GetTask();
+- const bool f = p;
+- if (f) {
++ if (p) {
+ SCOPED_MT_TIMER("::ThreadWorkers (accumulated)");
+ (*p)();
+ }
+- return f;
++ return static_cast<bool>(p);
+ }
+
+
Copied: spring/repos/community-staging-x86_64/spring.install (from rev 117451, spring/trunk/spring.install)
===================================================================
--- community-staging-x86_64/spring.install (rev 0)
+++ community-staging-x86_64/spring.install 2014-08-16 10:50:32 UTC (rev 117452)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
More information about the arch-commits
mailing list