3 files changed, 28 insertions, 42 deletions
diff --git a/games/vbam/no_icons.patch b/games/vbam/no_icons.patch
deleted file mode 100644
index a1c06d5b56..0000000000
--- a/games/vbam/no_icons.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rupN vbam-r1159.orig/src/gtk/window.cpp vbam-r1159/src/gtk/window.cpp
---- vbam-r1159.orig/src/gtk/window.cpp	2013-02-03 12:59:48.000000000 +0000
-+++ vbam-r1159/src/gtk/window.cpp	2013-09-11 15:21:43.646331404 +0100
-@@ -248,6 +248,7 @@ Window::Window(GtkWindow * _pstWindow, c
-   m_poRecentChooserMenu->set_show_numbers();
-   m_poRecentChooserMenu->set_show_tips();
-   m_poRecentChooserMenu->set_local_only();
-+  m_poRecentChooserMenu->set_show_icons(false);
-   m_poRecentChooserMenu->add_filter(oRecentFilter);
-   m_poRecentChooserMenu->signal_item_activated().connect(
-                                                    sigc::mem_fun(*this, &Window::vOnRecentFile));
diff --git a/games/vbam/vbam.SlackBuild b/games/vbam/vbam.SlackBuild
index 4470287b87..b4e7b49e2d 100644
--- a/games/vbam/vbam.SlackBuild
+++ b/games/vbam/vbam.SlackBuild
@@ -22,10 +22,13 @@
 # Modified by the SlackBuilds.org project.
 
 PRGNAM=vbam
-VERSION=${VERSION:-r1202}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-r1231}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Set to ON to enable FFMPEG A/V recording.
+FFMPEG=${FFMPEG:-OFF}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -59,16 +62,12 @@ fi
 
 set -e
 
-# 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-$SRCVER
-mkdir -p $PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.?z*
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -76,32 +75,30 @@ 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 {} \;
 
-# See here for an explanation:
-# http://www.linuxquestions.org/questions/slackware-14/vbam-slackbuild-4175476221/page3.html#post5025795
-patch -p1 --verbose < $CWD/no_icons.patch
-
-cmake . \
-  -DCMAKE_C_FLAGS="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
-  -DCMAKE_INSTALL_PREFIX="/usr" \
-  -DENABLE_ASM_CORE=${ASM} \
-  -DENABLE_ASM_SCALERS=${ASM} \
-  -DENABLE_FFMPEG=${FFMPEG} \
-  -DENABLE_DEBUGGER=OFF \
-  -DENABLE_SDL=OFF
-
-make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_ASM_CORE=${ASM} \
+    -DENABLE_ASM_SCALERS=${ASM} \
+    -DENABLE_FFMPEG=${FFMPEG} \
+    -DENABLE_DEBUGGER=OFF \
+    -DENABLE_SDL=OFF \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 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/man/man1
 gzip -9c debian/gvbam.1 > $PKG/usr/man/man1/gvbam.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/vbam/vbam.info b/games/vbam/vbam.info
index 12c6e514c4..a03004ac4b 100644
--- a/games/vbam/vbam.info
+++ b/games/vbam/vbam.info
@@ -1,8 +1,8 @@
 PRGNAM="vbam"
-VERSION="r1202"
+VERSION="r1231"
 HOMEPAGE="http://vba-m.com/"
-DOWNLOAD="http://sourceforge.net/projects/vbam/files/vbam-src/vbam-r1202-src.tar.bz2"
-MD5SUM="ea237d58d30e3086422d137ef4720969"
+DOWNLOAD="http://duganchen.ca/files/vbam-r1231.tar.xz"
+MD5SUM="f435c424cddbe9e8e1fe9a0ffcddd324"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SFML gtkglextmm"