games/solarus: Updated for version 1.5.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 21 insertions, 11 deletions

diff --git a/games/solarus/README b/games/solarus/README
index 46b3821055..492954d9ed 100644
--- a/games/solarus/README
+++ b/games/solarus/README
@@ -4,4 +4,7 @@ Development began in 2006. The goal of the engine is to allow people to
 create their own Action-RPG games (also called Zelda-like games). It is
 totally independent from Nintendo.
 
-This will require game data like zsdx.
+Solarus will require game data like zsdx.
+
+qt5 is an optional dependency for the GUI frontend and required for the
+solarus-quest-editor.
diff --git a/games/solarus/solarus.SlackBuild b/games/solarus/solarus.SlackBuild
index 19d36b2fa4..aa031e2b3f 100644
--- a/games/solarus/solarus.SlackBuild
+++ b/games/solarus/solarus.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for solarus
 
-# Copyright 2015 Hunter Sezen California, USA
+# Copyright 2015-2016 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=solarus
-VERSION=${VERSION:-1.4.5}
+VERSION=${VERSION:-1.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,14 +69,20 @@ 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 {} \;
 
+if ! pkg-config --exists Qt5Core; then
+  GUI="-DSOLARUS_GUI=OFF"
+fi
+
 mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSOLARUS_EXECUTABLE_INSTALL_DESTINATION:PATH=games \
     -DSOLARUS_LIBRARY_INSTALL_DESTINATION:PATH=lib${LIBDIRSUFFIX} \
-    -DDEFAULT_QUEST=/usr/share/solarus/zsdx \
+    -DSOLARUS_DEFAULT_QUEST=/usr/share/games/$PRGNAM/zsdx \
+    $GUI \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
@@ -89,8 +95,9 @@ install -Dm0644 $PRGNAM.6 $PKG/usr/man/man6/$PRGNAM.6
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+DOCS="changelog.txt compilation.txt README.md license.txt"
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog README.md license.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/solarus/solarus.info b/games/solarus/solarus.info
index ca62ac141f..8958a509b5 100644
--- a/games/solarus/solarus.info
+++ b/games/solarus/solarus.info
@@ -1,8 +1,8 @@
 PRGNAM="solarus"
-VERSION="1.4.5"
+VERSION="1.5.0"
 HOMEPAGE="http://www.solarus-games.org/"
-DOWNLOAD="http://www.solarus-games.org/downloads/solarus/solarus-1.4.5-src.tar.gz"
-MD5SUM="d61023d53aaae4fc68517aa262c7cf04"
+DOWNLOAD="http://www.solarus-games.org/downloads/solarus/solarus-1.5.0-src.tar.gz"
+MD5SUM="4cf3a71937231911d25e45c3da6b4bb2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="OpenAL SDL2_image SDL2_ttf libmodplug luajit physfs"