games/snes9x: Updated for version 1.54.1.

3 files changed, 14 insertions, 54 deletions

diff --git a/games/snes9x/snes9x-fix-crash.patch b/games/snes9x/snes9x-fix-crash.patch
deleted file mode 100644
index 95ed192e0db4..000000000000
--- a/games/snes9x/snes9x-fix-crash.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6d74746342a73cf65db215f4fdecdfb0cae66792 Mon Sep 17 00:00:00 2001
-From: Brandon Wright <bearoso@gmail.com>
-Date: Mon, 10 Feb 2014 16:28:05 -0600
-Subject: [PATCH] Fix bug caused by virtual directories.
-
----
- gtk/src/gtk_file.cpp | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/gtk/src/gtk_file.cpp b/gtk/src/gtk_file.cpp
-index a0df75d..9c0e000 100644
---- a/gtk/src/gtk_file.cpp
-+++ b/gtk/src/gtk_file.cpp
-@@ -465,8 +465,11 @@ S9xOpenROMDialog (void)
-         filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-         directory =
-             gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
--        strncpy (gui_config->last_directory, directory, PATH_MAX);
--        g_free (directory);
-+        if (directory)
-+        {
-+            strncpy (gui_config->last_directory, directory, PATH_MAX);
-+            g_free (directory);
-+        }
-     }
- 
-     else
--- 
-1.9.3
-
diff --git a/games/snes9x/snes9x.SlackBuild b/games/snes9x/snes9x.SlackBuild
index 1f54a101800e..e33af8574997 100644
--- a/games/snes9x/snes9x.SlackBuild
+++ b/games/snes9x/snes9x.SlackBuild
@@ -6,9 +6,12 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20161015 bkw: update for 1.54.1. script has changed enough that it
+# can't build 1.53 any more.
+
 PRGNAM=snes9x
-VERSION=${VERSION:-1.53}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.54.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -43,9 +46,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-src
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.bz2
-cd $PRGNAM-$VERSION-src
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -53,16 +56,9 @@ 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 {} \;
 
-# Patch avoids crashes caused by the 'open recent' UI menu. Not been
-# able to reproduce the crash myself, but all the patch does is check
-# a pointer to make sure it's not null, before using it (can't see how
-# that could hurt anything).
-# Patch came from here:
-# https://git.archlinux.org/svntogit/community.git/plain/snes9x/repos/community-i686/snes9x-fix-crash.patch
-
-patch -p1 < $CWD/snes9x-fix-crash.patch
-
 cd gtk
+./autogen.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -79,14 +75,8 @@ make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/man/man6
 gzip -9c $CWD/snes9x-gtk.6 > $PKG/usr/man/man6/snes9x-gtk.6.gz
-
-cd $PKG/usr/man/man6
-  ln -s $PRGNAM-gtk.6.gz $PRGNAM.gz
-cd -
-
-cd $PKG/usr/games
-  ln -s $PRGNAM-gtk $PRGNAM
-cd -
+ln -s $PRGNAM-gtk.6.gz $PKG/usr/man/man6/$PRGNAM.6.gz
+ln -s $PRGNAM-gtk $PKG/usr/games/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/${PRGNAM}_original_docs
 cp doc/* $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/snes9x/snes9x.info b/games/snes9x/snes9x.info
index bedf9344524c..d075c7c5946a 100644
--- a/games/snes9x/snes9x.info
+++ b/games/snes9x/snes9x.info
@@ -1,7 +1,7 @@
 PRGNAM="snes9x"
-VERSION="1.53"
+VERSION="1.54.1"
 HOMEPAGE="https://github.com/snes9xgit/snes9x"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/snes9x-1.53-src.tar.bz2"
+DOWNLOAD="https://github.com/snes9xgit/snes9x/archive/1.54.1.tar.gz"
 MD5SUM="69ec1743a1da7de7b5d55a43b0e2ed10"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""