From 5284adf02e556a7d2a99f57c8c997f418a7b3227 Mon Sep 17 00:00:00 2001
From: Johannes Schoepfer <slackbuilds@schoepfer.info>
Date: Fri, 23 Oct 2020 20:07:05 +0100
Subject: games/oolite: Updated for version 1.90.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 games/oolite/oolite.SlackBuild | 22 ++++++++++++++++------
 games/oolite/oolite.info       |  6 +++---
 2 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'games/oolite')

diff --git a/games/oolite/oolite.SlackBuild b/games/oolite/oolite.SlackBuild
index aae751148255..04d0866d96ea 100644
--- a/games/oolite/oolite.SlackBuild
+++ b/games/oolite/oolite.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for oolite
 
-# Copyright 2016 - 2018 Johannes Schoepfer, Germany
+# Copyright 2016 - 2020 Johannes Schoepfer, Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=oolite
-VERSION=${VERSION:-1.88}
+VERSION=${VERSION:-1.90}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,18 +69,28 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Make sure only system libs may be used
+rm deps/Linux-deps/x86*/lib/*
+
 source /usr/share/GNUstep/Makefiles/GNUstep.sh
 export GNUSTEP_MAKEFILES=/usr/share/GNUstep/Makefiles
-sed -i "/ADDITIONAL_OBJSLKFLAGS/s/=/= -fobjc-exceptions ${SLKCFLAGS}/" GNUmakefile
-make -f libjs.make debug=no
-make -f Makefile ESPEAK=yes release-deployment
+## Link to espeak-ng instead of espeak 
+#  -e "/ADDITIONAL_OBJC_LIBS/s/+= -lespeak/+= -lespeak-ng/" \
+sed -i \
+  -e "/ADDITIONAL_OBJCFLAGS/s/=/= -fobjc-exceptions ${SLKCFLAGS}/" \
+  -e "s/-mtune=generic//g" \
+  -e "s/ -lpng / -l:libpng14.so.14 /g" \
+  GNUmakefile
+
+make -f Makefile ESPEAK=yes use_deps=no debug=no release
 
 mkdir -p $PKG/usr/share/{oolite,pixmaps,applications}
 cp -a oolite.app/* $PKG/usr/share/oolite/
 cp installers/FreeDesktop/oolite-icon.png $PKG/usr/share/pixmaps
 cp installers/FreeDesktop/oolite.desktop $PKG/usr/share/applications
 
-find $PKG -type f -exec file {} + | fgrep -e "executable" -e "shared object" | fgrep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find $PKG -type f -exec file {} + | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/games
 cat << 'EOF' > $PKG/usr/games/oolite
diff --git a/games/oolite/oolite.info b/games/oolite/oolite.info
index 9c74d2046326..a7b6028400a4 100644
--- a/games/oolite/oolite.info
+++ b/games/oolite/oolite.info
@@ -1,8 +1,8 @@
 PRGNAM="oolite"
-VERSION="1.88"
+VERSION="1.90"
 HOMEPAGE="http://www.oolite.org/"
-DOWNLOAD="https://github.com/OoliteProject/oolite/releases/download/1.88/oolite-source-1.88.tar.bz2"
-MD5SUM="e42fe5dd4788d69d102f121bc5226b3d"
+DOWNLOAD="https://github.com/OoliteProject/oolite/releases/download/1.90/oolite-source-1.90.tar.bz2"
+MD5SUM="c34c6f88606be75c90cc52c5a4173611"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="espeak gnustep-base OpenAL"
-- 
cgit v1.2.3