games/vbam: Updated for version r1001.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

5 files changed, 22 insertions, 36 deletions

diff --git a/games/vbam/README b/games/vbam/README
index 36fc34b35c..e5b5f418cb 100644
--- a/games/vbam/README
+++ b/games/vbam/README
@@ -1,7 +1,11 @@
-Our goal is to improve upon VisualBoyAdvance by integrating the best features 
-from the various builds floating around. Unfortunately work on the "official" 
-project seems to have stalled. Independent developers have added excellent 
-features to VBA, but seem to have done so individually. The source codes for 
-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! 
+Our goal is to improve upon VisualBoyAdvance by integrating the best features
+from the various builds floating around. Unfortunately work on the "official"
+project seems to have stalled. Independent developers have added excellent
+features to VBA, but seem to have done so individually. The source codes for
+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.
diff --git a/games/vbam/slack-desc b/games/vbam/slack-desc
index 8fc3b61e7a..92437066c6 100644
--- a/games/vbam/slack-desc
+++ b/games/vbam/slack-desc
@@ -7,10 +7,10 @@
 
     |-----handy-ruler------------------------------------------------------|
 vbam: vbam (cross-platform GameBoy emulator)
-vbam: 
+vbam:
 vbam: vbam is a project dedicated to gathering community patches to the
 vbam: VisualBoyAdvance GameBoy emulator into one easily accessible project.
-vbam: 
+vbam:
 vbam: Homepage: http://vba-m.ngemu.com
 vbam:
 vbam:
diff --git a/games/vbam/vbam-r856-debugger.cpp.diff b/games/vbam/vbam-r856-debugger.cpp.diff
deleted file mode 100644
index e50a13744b..0000000000
--- a/games/vbam/vbam-r856-debugger.cpp.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur vbam-r856.orig//src/sdl/debugger.cpp vbam-r856/src/sdl/debugger.cpp
---- vbam-r856.orig//src/sdl/debugger.cpp	2009-01-01 10:11:02.000000000 -0600
-+++ vbam-r856/src/sdl/debugger.cpp	2010-05-24 00:45:28.625665663 -0500
-@@ -941,10 +941,10 @@
-     u32 address = 0;
-     u32 value = 0;
-     int type = 0;
--    const char *s = args[1];
-+    char *s = args[1];
-     char c = *s;
-     if(strchr(s, ':')) {
--      const char *name = s;
-+      char *name = s;
-       char *l = strchr(s, ':');
-       *l++ = 0;
-       int line = atoi(l);
diff --git a/games/vbam/vbam.SlackBuild b/games/vbam/vbam.SlackBuild
index 437351b09c..7e67e748bf 100644
--- a/games/vbam/vbam.SlackBuild
+++ b/games/vbam/vbam.SlackBuild
@@ -15,20 +15,18 @@
 # email address, I may be able to see what you did
 # wrong and prevent it from happening in the future.
 # In which case, I may just send YOU five dollars.
-#
+
 # Modified by the SlackBuilds.org project.
 
 PRGNAM=vbam
-VERSION=r856
+VERSION=r1001
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -54,6 +52,9 @@ fi
 
 set -e
 
+# Change this to disable the GTK frontend
+BUILD_GTK=${BUILD_GTK:-yes}
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -66,14 +67,11 @@ find . \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Fix an invalid conversion from const char to char
-patch -p1 < $CWD/vbam-r856-debugger.cpp.diff
-
 cmake . \
   -DCMAKE_C_FLAGS="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
   -DCMAKE_INSTALL_PREFIX="/usr" \
-  -DNO_GTK=1
+  -DENABLE_GTK=${BUILD_GTK}
 
 make
 make install DESTDIR=$PKG
diff --git a/games/vbam/vbam.info b/games/vbam/vbam.info
index f91fd0bb4a..30f89ae9f7 100644
--- a/games/vbam/vbam.info
+++ b/games/vbam/vbam.info
@@ -1,8 +1,8 @@
 PRGNAM="vbam"
-VERSION="r856"
+VERSION="r1001"
 HOMEPAGE="http://vba-m.ngemu.com/"
-DOWNLOAD="http://slaxer.com/sources/vbam-r856.tar.bz2"
-MD5SUM="974acd6ff8a0b47dea232aa97b003dbe"
+DOWNLOAD="http://slaxer.com/sources/vbam-r1001.tar.bz2"
+MD5SUM="693bc1177d362552c4a6567ec2eea04f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="JK Wood"