4 files changed, 41 insertions, 19 deletions
diff --git a/games/vbam/README b/games/vbam/README
index e5b5f418cb83e..d3a1da6b698dd 100644
--- a/games/vbam/README
+++ b/games/vbam/README
@@ -6,6 +6,11 @@ many of these forks seem to be abandoned, outdated or missing altogether.
 We aim to preserve all of the hard work done by these developers to make the
 already great VisualBoyAdvance even better!
 
-By default, VBA-M requires gtkglextmm.  However, you can build without the
-gui, which drops the GTK dependency chain, by passing BUILD_GTK=no to the
-SlackBuild.
+The following options are available:
+
+GTK=ON will build the GTK GUI. It requires gtkglextmm.
+
+WX=ON will build the WxWidgets GUI. It requires WxWidgets.
+
+FFMPEG=ON will enable recording and playback. It requires FFMPEG.
+
diff --git a/games/vbam/slack-desc b/games/vbam/slack-desc
index 92437066c63fb..0479341d2b7da 100644
--- a/games/vbam/slack-desc
+++ b/games/vbam/slack-desc
@@ -11,7 +11,7 @@ vbam:
 vbam: vbam is a project dedicated to gathering community patches to the
 vbam: VisualBoyAdvance GameBoy emulator into one easily accessible project.
 vbam:
-vbam: Homepage: http://vba-m.ngemu.com
+vbam: Homepage: http://vba-m.com
 vbam:
 vbam:
 vbam:
diff --git a/games/vbam/vbam.SlackBuild b/games/vbam/vbam.SlackBuild
index 177dbbf81dcf8..5c91da53a81a3 100644
--- a/games/vbam/vbam.SlackBuild
+++ b/games/vbam/vbam.SlackBuild
@@ -1,5 +1,8 @@
 #!/bin/sh
 # Slackbuild for vbam
+
+# Currently maintained by Dugan Chen <thedoogster@gmail.com>
+
 # Written by JK Wood <joshuakwood@gmail.com>
 
 # Slackbuild is released under the Dog-on-Fire License:
@@ -19,8 +22,8 @@
 # Modified by the SlackBuilds.org project.
 
 PRGNAM=vbam
-VERSION=r1001
-BUILD=${BUILD:-2}
+VERSION=1.8.0.1054
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -39,27 +42,37 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
+  ASM=ON # x86 ASM optimizations are available.
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
+  ASM=ON
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+  ASM=OFF
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
+  ASM=OFF
 fi
 
 set -e
 
-# Change this to disable the GTK frontend
-BUILD_GTK=${BUILD_GTK:-yes}
+# Set to ON to enable the GTK frontend
+GTK=${GTK:-OFF}
+
+# Set to ON to enable the WxWidgets frontend
+WX=${WX:-OFF}
+
+# Set to ON to enable FFMPEG A/V recording.
+FFMPEG=${FFMPEG:-OFF}
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -71,7 +84,11 @@ cmake . \
   -DCMAKE_C_FLAGS="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
   -DCMAKE_INSTALL_PREFIX="/usr" \
-  -DENABLE_GTK=${BUILD_GTK}
+  -DENABLE_ASM_CORE=${ASM} \
+  -DENABLE_ASM_SCALERS=${ASM} \
+  -DENABLE_GTK=${GTK} \
+  -DENABLE_WX=${WX} \
+  -DENABLE_FFMPEG=${FFMPEG}
 
 make
 make install DESTDIR=$PKG
@@ -81,11 +98,11 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 mv $PKG/etc/vbam.cfg $PKG/etc/vbam.cfg.new
 
-mkdir -p $PKG/usr/man 
+mkdir -p $PKG/usr/man
 gzip -9c debian/vbam.1 > $PKG/usr/man/vbam.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/License.txt doc/ReadMe.SDL.txt doc/gpl.txt \
+cp -a doc/* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/games/vbam/vbam.info b/games/vbam/vbam.info
index 30f89ae9f78b9..ad239a60efcee 100644
--- a/games/vbam/vbam.info
+++ b/games/vbam/vbam.info
@@ -1,10 +1,10 @@
 PRGNAM="vbam"
-VERSION="r1001"
-HOMEPAGE="http://vba-m.ngemu.com/"
-DOWNLOAD="http://slaxer.com/sources/vbam-r1001.tar.bz2"
-MD5SUM="693bc1177d362552c4a6567ec2eea04f"
+VERSION="1.8.0.1054"
+HOMEPAGE="http://vba-m.com/"
+DOWNLOAD="http://sourceforge.net/projects/vbam/files/vbam-1.8.0.1054-src.tar.gz"
+MD5SUM="f9a67e65dd6df4d5190321f6fc758c24"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="JK Wood"
-EMAIL="joshuakwood@gmail.com"
-APPROVED="rworkman"
+MAINTAINER="Dugan Chen"
+EMAIL="thedoogster [at] gmail [dot] com"
+APPROVED="dsomero"