[Lunar-commits] <moonbase-other> Merge branch 'master' of github.com:lunar-linux/moonbase-other

[Florin Braescu]

commit e05b0b5c303a68876d5130ecf254c18f63397231
Author: Florin Braescu <florin at lunar-linux.org>
Date: Sat, 16 Aug 2014 08:55:55 +0300
URL: https://github.com/lunar-linux/moonbase-other/commit/e05b0b5c303a68876d5130ecf254c18f63397231

Merge branch 'master' of github.com:lunar-linux/moonbase-other
---
  games/oolite/DETAILS   | +4/-8     
  games/oolite/PRE_BUILD | +2/-12    
  2 files changed, 6 insertions(+), 20 deletions(-)

--- a/games/oolite/DETAILS
+++ b/games/oolite/DETAILS
@@ -1,17 +1,13 @@
           MODULE=oolite
-         VERSION=1.77.1
+         VERSION=1.80
           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:6a72d2e7a159dde7b635f41632a672ce113b0d6f
-     SOURCE2_VFY=sha1:351d141c3a3893abac1933148551e00384008e5e
+      SOURCE_URL=https://github.com/OoliteProject/oolite/releases/download/1.80b/
+      SOURCE_VFY=sha1:a7623599b86fbe1411a2e344f7e17a6d2f250209
         WEB_SITE=http://www.oolite.org
          ENTERED=20120714
-         UPDATED=20131013
+         UPDATED=20140730
            SHORT="space simulator game"
-           PSAFE=no
 
 cat << EOF
 Oolite is a space simulator game.
--- a/games/oolite/PRE_BUILD
+++ b/games/oolite/PRE_BUILD
@@ -1,14 +1,4 @@
 default_pre_build &&
 
-cd $SOURCE_DIRECTORY/deps/Cross-platform-deps/ &&
-
-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 &&
-
-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
+# API change with libpng 1.6
+sedit '/void png/ d' src/Core/Materials/OOPNGTextureLoader.m