[arch-commits] Commit in spring/repos (8 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Wed Apr 22 19:15:14 UTC 2015
Date: Wednesday, April 22, 2015 @ 21:15:13
Author: svenstaro
Revision: 131988
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
spring/repos/community-staging-i686/
spring/repos/community-staging-i686/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch
(from rev 131987, spring/trunk/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch)
spring/repos/community-staging-i686/PKGBUILD
(from rev 131987, spring/trunk/PKGBUILD)
spring/repos/community-staging-i686/spring.install
(from rev 131987, spring/trunk/spring.install)
spring/repos/community-staging-x86_64/
spring/repos/community-staging-x86_64/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch
(from rev 131987, spring/trunk/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch)
spring/repos/community-staging-x86_64/PKGBUILD
(from rev 131987, spring/trunk/PKGBUILD)
spring/repos/community-staging-x86_64/spring.install
(from rev 131987, spring/trunk/spring.install)
------------------------------------------------------------------------------------------+
community-staging-i686/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch | 32 ++++++
community-staging-i686/PKGBUILD | 51 ++++++++++
community-staging-i686/spring.install | 12 ++
community-staging-x86_64/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch | 32 ++++++
community-staging-x86_64/PKGBUILD | 51 ++++++++++
community-staging-x86_64/spring.install | 12 ++
6 files changed, 190 insertions(+)
Copied: spring/repos/community-staging-i686/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch (from rev 131987, spring/trunk/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch)
===================================================================
--- community-staging-i686/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch (rev 0)
+++ community-staging-i686/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch 2015-04-22 19:15:13 UTC (rev 131988)
@@ -0,0 +1,32 @@
+From 9e0db5f602407de4e7875ca85761b41782c1bb9c Mon Sep 17 00:00:00 2001
+From: Johan Rehnberg <cleanrock at gmail.com>
+Date: Wed, 31 Dec 2014 11:35:19 +0100
+Subject: [PATCH] fix GetListOfSubModules to support GLOB returning both "//"
+ and "/"
+
+I needed this when building on archlinux with cmake 3.1.0 where GLOB returns "/"
+---
+ rts/build/cmake/Util.cmake | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/rts/build/cmake/Util.cmake b/rts/build/cmake/Util.cmake
+index 9f49e54..e23db7b 100644
+--- a/rts/build/cmake/Util.cmake
++++ b/rts/build/cmake/Util.cmake
+@@ -166,10 +166,11 @@ EndFunction (MakeGlobal)
+ # Find all CMakeLists.txt files in sub-directories
+ Macro (GetListOfSubModules list_var)
+ File(GLOB ${list_var} RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" FOLLOW_SYMLINKS "${CMAKE_CURRENT_SOURCE_DIR}/*/CMakeLists.txt")
+-
+ # Strip away the "/CMakeLists.txt" parts, so we end up with just a list of dirs,
+ # for example: AAI;RAI;KAIK
+- String(REPLACE "//CMakeLists.txt" "" ${list_var} "${${list_var}}")
++ # GLOB can prefix with "//" or "/" (perhaps changed in cmake 3.1.0), this double replace will support both "//" and "/"
++ String(REPLACE "/CMakeLists.txt" "" ${list_var} "${${list_var}}")
++ String(REPLACE "/" "" ${list_var} "${${list_var}}")
+ EndMacro (GetListOfSubModules list_var)
+
+
+--
+2.2.1
+
Copied: spring/repos/community-staging-i686/PKGBUILD (from rev 131987, spring/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-04-22 19:15:13 UTC (rev 131988)
@@ -0,0 +1,51 @@
+# $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=98.0
+pkgrel=5
+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
+ 0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch)
+md5sums=('fbe60dff4d39918157869f45738e0a8a'
+ 'a8a8e5038439d43baaeac26585f5caf9')
+
+prepare() {
+ bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
+
+ cd spring_${pkgver}
+
+ patch -Np1 -i ../0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch
+}
+
+build() {
+ cd spring_${pkgver}
+
+ 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/spring.install (from rev 131987, spring/trunk/spring.install)
===================================================================
--- community-staging-i686/spring.install (rev 0)
+++ community-staging-i686/spring.install 2015-04-22 19:15:13 UTC (rev 131988)
@@ -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/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch (from rev 131987, spring/trunk/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch)
===================================================================
--- community-staging-x86_64/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch (rev 0)
+++ community-staging-x86_64/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch 2015-04-22 19:15:13 UTC (rev 131988)
@@ -0,0 +1,32 @@
+From 9e0db5f602407de4e7875ca85761b41782c1bb9c Mon Sep 17 00:00:00 2001
+From: Johan Rehnberg <cleanrock at gmail.com>
+Date: Wed, 31 Dec 2014 11:35:19 +0100
+Subject: [PATCH] fix GetListOfSubModules to support GLOB returning both "//"
+ and "/"
+
+I needed this when building on archlinux with cmake 3.1.0 where GLOB returns "/"
+---
+ rts/build/cmake/Util.cmake | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/rts/build/cmake/Util.cmake b/rts/build/cmake/Util.cmake
+index 9f49e54..e23db7b 100644
+--- a/rts/build/cmake/Util.cmake
++++ b/rts/build/cmake/Util.cmake
+@@ -166,10 +166,11 @@ EndFunction (MakeGlobal)
+ # Find all CMakeLists.txt files in sub-directories
+ Macro (GetListOfSubModules list_var)
+ File(GLOB ${list_var} RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" FOLLOW_SYMLINKS "${CMAKE_CURRENT_SOURCE_DIR}/*/CMakeLists.txt")
+-
+ # Strip away the "/CMakeLists.txt" parts, so we end up with just a list of dirs,
+ # for example: AAI;RAI;KAIK
+- String(REPLACE "//CMakeLists.txt" "" ${list_var} "${${list_var}}")
++ # GLOB can prefix with "//" or "/" (perhaps changed in cmake 3.1.0), this double replace will support both "//" and "/"
++ String(REPLACE "/CMakeLists.txt" "" ${list_var} "${${list_var}}")
++ String(REPLACE "/" "" ${list_var} "${${list_var}}")
+ EndMacro (GetListOfSubModules list_var)
+
+
+--
+2.2.1
+
Copied: spring/repos/community-staging-x86_64/PKGBUILD (from rev 131987, spring/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-04-22 19:15:13 UTC (rev 131988)
@@ -0,0 +1,51 @@
+# $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=98.0
+pkgrel=5
+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
+ 0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch)
+md5sums=('fbe60dff4d39918157869f45738e0a8a'
+ 'a8a8e5038439d43baaeac26585f5caf9')
+
+prepare() {
+ bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
+
+ cd spring_${pkgver}
+
+ patch -Np1 -i ../0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch
+}
+
+build() {
+ cd spring_${pkgver}
+
+ 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/spring.install (from rev 131987, spring/trunk/spring.install)
===================================================================
--- community-staging-x86_64/spring.install (rev 0)
+++ community-staging-x86_64/spring.install 2015-04-22 19:15:13 UTC (rev 131988)
@@ -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