Permalink
Browse files

Merge pull request #114 from v4hn/oolite

oolite: version bump
  • Loading branch information...
2 parents 2b8f4e1 + 1c866b4 commit 89e2b9db30c83627f3686c2a24c479186be7afba @cavalier38 cavalier38 committed Nov 9, 2013
Showing with 18 additions and 13 deletions.
  1. +1 −8 games/oolite/BUILD
  2. +1 −1 games/oolite/DEPENDS
  3. +3 −3 games/oolite/DETAILS
  4. +6 −1 games/oolite/PRE_BUILD
  5. +7 −0 gnustep/gnustep-make/PRE_BUILD
View
@@ -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 &&
View
@@ -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"
View
@@ -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
View
@@ -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
@@ -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

0 comments on commit 89e2b9d

Please sign in to comment.