[Lunar-commits] <moonbase-other> Merge pull request #114 from v4hn/oolite

[Peter de Ridder]

commit 89e2b9db30c83627f3686c2a24c479186be7afba
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Sat, 09 Nov 2013 15:54:24 -0800
URL: https://github.com/lunar-linux/moonbase-other/commit/89e2b9db30c83627f3686c2a24c479186be7afba

Merge pull request #114 from v4hn/oolite

oolite: version bump
---
  games/oolite/BUILD             | +1/-8     
  games/oolite/DEPENDS           | +1/-1     
  games/oolite/DETAILS           | +3/-3     
  games/oolite/PRE_BUILD         | +6/-1     
  gnustep/gnustep-make/PRE_BUILD | +7/-0     
  5 files changed, 18 insertions(+), 13 deletions(-)

--- a/games/oolite/BUILD
+++ b/games/oolite/BUILD
@@ -1,13 +1,6 @@
-sedit "/NO_RETURN_FUNC/ d" src/Core/Materials/OOPNGTextureLoader.m &&
-if in_depends $MODULE espeak; then
- sedit "s:ESPEAK *=.*$:ESPEAK = yes:" config.make
-else
- sedit "s:ESPEAK *=.*$:ESPEAK = no:" config.make
-fi &&
-
 . /usr/share/GNUstep/Makefiles/GNUstep.sh &&
 
-make -f Makefile release &&
+make -f Makefile release $OPTS &&
 
 prepare_install &&
 
--- a/games/oolite/DEPENDS
+++ b/games/oolite/DEPENDS
@@ -3,4 +3,4 @@ depends gnustep-base
 depends mesa-lib
 depends SDL_mixer
 
-optional_depends espeak "-foo" "-bar" "for spoken notifications"
+optional_depends espeak "ESPEAK=yes" "ESPEAK=no" "for spoken notifications"
--- a/games/oolite/DETAILS
+++ b/games/oolite/DETAILS
@@ -1,15 +1,15 @@
           MODULE=oolite
-         VERSION=1.77
+         VERSION=1.77.1
           SOURCE=$MODULE-source-$VERSION.tar.bz2
 	 SOURCE2=firefox-4.0.source.js-only.tbz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-source-$VERSION
       SOURCE_URL=$SFORGE_URL/oolite.mirror/
      SOURCE2_URL=http://jens.ayton.se/oolite/deps/
-      SOURCE_VFY=sha1:a42f1bd65609a197866d441bca2854823ac6c628
+      SOURCE_VFY=sha1:6a72d2e7a159dde7b635f41632a672ce113b0d6f
      SOURCE2_VFY=sha1:351d141c3a3893abac1933148551e00384008e5e
         WEB_SITE=http://www.oolite.org
          ENTERED=20120714
-         UPDATED=20120714
+         UPDATED=20131013
            SHORT="space simulator game"
            PSAFE=no
 
--- a/games/oolite/PRE_BUILD
+++ b/games/oolite/PRE_BUILD
@@ -6,4 +6,9 @@ tar xf $SOURCE_CACHE/$SOURCE2 &&
 mv mozilla-2.0 mozilla &&
 echo 'http://jens.ayton.se/oolite/deps/firefox-4.0.source.js-only.tbz' > mozilla/current.url &&
 
-cd $SOURCE_DIRECTORY
+cd $SOURCE_DIRECTORY &&
+
+sedit "/NO_RETURN_FUNC/ d" src/Core/Materials/OOPNGTextureLoader.m &&
+
+# fix library order to use correct js library
+sedit 's:-L/usr/X11R6/lib/ -L$(LIBJS_LIB_DIR):-L$(LIBJS_LIB_DIR) -L/usr/X11R6/lib/:' GNUmakefile
--- /dev/null
+++ b/gnustep/gnustep-make/PRE_BUILD
@@ -0,0 +1,7 @@
+if [[ ! "$(get_other_module_config gcc LANGUAGES)" = *objc* ]]; then
+  message "${PROBLEM_COLOR}GnuStep largely depends on the ObjC support of gcc.\n" \
+          "Please recompile gcc with Objective C support and retry${DEFAULT_COLOR}." &&
+  false
+fi &&
+
+default_pre_build