games/scummvm: Updated for version 0.13.1

3 files changed, 28 insertions, 48 deletions

diff --git a/games/scummvm/README b/games/scummvm/README
index 3d78f19ba5..d958efead6 100644
--- a/games/scummvm/README
+++ b/games/scummvm/README
@@ -1,13 +1,9 @@
-ScummVM is a collection of interpreters, capable of emulating several 
-adventure game engines. ScummVM mainly supports engines created using 
-SCUMM (Script Creation Utility for Maniac Mansion), used in various 
-LucasArts games such as Monkey Island, Day of the Tentacle, and others. 
-ScummVM also contains interpreters for several non-SCUMM games - currently 
+ScummVM is a collection of interpreters, capable of emulating several
+adventure game engines. ScummVM mainly supports engines created using
+SCUMM (Script Creation Utility for Maniac Mansion), used in various
+LucasArts games such as Monkey Island, Day of the Tentacle, and others.
+ScummVM also contains interpreters for several non-SCUMM games - currently
 Beneath a Steel Sky, Broken Sword I & II, and Simon the Sorcerer 1 & 2.
 
-If you are building this on Slamd64, execute the build script as follows:
-  DISTRO=slamd64 ARCH=x86_64 ./scummvm.SlackBuild
-
-If you build on a multicore system, add JOBS={core #} to enable parallel
-compilation; for example, to start 4 build jobs simultaneously, do:
-	JOBS=4 ./scummvm.SlackBuild
+ScummVM optionally uses libmpeg2 and fluidsynth, both are available from
+SlackBuilds.org
\ No newline at end of file
diff --git a/games/scummvm/scummvm.SlackBuild b/games/scummvm/scummvm.SlackBuild
index 69aeef61ca..c1a8e7d6a4 100644
--- a/games/scummvm/scummvm.SlackBuild
+++ b/games/scummvm/scummvm.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=scummvm
-VERSION=0.11.0
+VERSION=0.13.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -34,38 +34,18 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DISTRO=${DISTRO:-slackware}
-
-if [ $DISTRO = slackware ]; then
-	PKGARCH=$ARCH
-else
-	PKGARCH=${ARCH}_${DISTRO}
-fi
-
-if [ $DISTRO = slamd64 ]; then
-	LIBDIRSUFFIX=64
-	SLKLDFLAGS="-L/usr/lib64"
-else
-	LIBDIRSUFFIX=
-	SLKLDFLAGS=
-fi
-
 DOCS="AUTHORS COPYING NEWS README TODO"
 
-case "$ARCH" in
-  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-             ;;
-  i686)      SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-             ;;
-  s390)      SLKCFLAGS="-O2"
-             ;;
-  powerpc)   SLKCFLAGS="-O2"
-             ;;
-  x86_64)    SLKCFLAGS="-O2 -fPIC"
-             ;;
-  athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
-             ;;
-esac
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -80,6 +60,8 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --bindir=/usr/games \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
   --mandir=/usr/man \
   --disable-debug \
   || exit 1
@@ -87,7 +69,7 @@ CXXFLAGS="$SLKCFLAGS" \
 make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-strip --strip-unneeded $PKG/usr/bin/scummvm 2> /dev/null
+strip --strip-unneeded $PKG/usr/games/scummvm 2> /dev/null
 
 # The .desktop file for the menu is not being installed
 install -D -m 0644 dists/scummvm.desktop \
@@ -113,4 +95,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$PKGARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/scummvm/scummvm.info b/games/scummvm/scummvm.info
index e9660e6906..0703555d53 100644
--- a/games/scummvm/scummvm.info
+++ b/games/scummvm/scummvm.info
@@ -1,8 +1,10 @@
 PRGNAM="scummvm"
-VERSION="0.11.0"
+VERSION="0.13.1"
 HOMEPAGE="http://www.scummvm.org/"
-DOWNLOAD="http://downloads.sourceforge.net/scummvm/scummvm-0.11.0.tar.bz2"
-MD5SUM="5066301a182b7e0f1da1eec21c80024f"
+DOWNLOAD="http://downloads.sourceforge.net/scummvm/scummvm-0.13.1.tar.bz2"
+MD5SUM="843d9cd4470022bd3b269eb84298dc16"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Yalla-One"
 EMAIL="yallaone@gmail.com"
-APPROVED="rworkman"
+APPROVED="rworkman,pprkut"