games/xroar: Updated for version 0.28.1, cleanups.

Noted the optional dependency gtkglext

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

7 files changed, 66 insertions, 19 deletions

diff --git a/games/xroar/README b/games/xroar/README
index 46b9beb8f5..91b8697649 100644
--- a/games/xroar/README
+++ b/games/xroar/README
@@ -1,11 +1,16 @@
+xroar (emulator for 6809-based systems)
+
 XRoar is a Dragon emulator for Linux, Unix, Mac OS X, GP32, Nintendo
 DS and Windows. Due to hardware similarities, XRoar also emulates the
 Tandy Colour Computer (CoCo) models 1 & 2.
 
+Optional dependency: if you want a full GTK+ user interface, install
+gtkglext before building xroar.
+
 To usefully emulate the Dragon or CoCo, you will need the images of
 the system ROMs for the target system. The ROM images must be copied to
 /usr/share/xroar/roms, and must be given the filenames xroar expects. See
-the xroar info page or /usr/doc/xroar-0.23b/xroar.html for details on
+the xroar info page or /usr/doc/xroar-$VERSION/xroar.html for details on
 ROM files.
 
 If you want to include ROM images in the package, get the files
diff --git a/games/xroar/alsa_first.diff b/games/xroar/alsa_first.diff
new file mode 100644
index 0000000000..ea726927d2
--- /dev/null
+++ b/games/xroar/alsa_first.diff
@@ -0,0 +1,23 @@
+diff -Naur xroar-0.28.1/module.c xroar-0.28.1.patched/module.c
+--- xroar-0.28.1/module.c	2012-06-11 12:45:20.000000000 -0400
++++ xroar-0.28.1.patched/module.c	2012-12-18 17:05:59.000000000 -0500
+@@ -94,6 +94,9 @@
+ #ifdef HAVE_SUN_AUDIO
+ 	&sound_sun_module,
+ #endif
++#ifdef HAVE_ALSA_AUDIO
++	&sound_alsa_module,
++#endif
+ #ifdef HAVE_OSS_AUDIO
+ 	&sound_oss_module,
+ #endif
+@@ -108,9 +111,6 @@
+ #ifdef HAVE_SDL
+ 	&sound_sdl_module,
+ #endif
+-#ifdef HAVE_ALSA_AUDIO
+-	&sound_alsa_module,
+-#endif
+ #ifdef HAVE_JACK_AUDIO
+ 	&sound_jack_module,
+ #endif
diff --git a/games/xroar/doinst.sh b/games/xroar/doinst.sh
index 4e8ba7071d..3e5691a052 100644
--- a/games/xroar/doinst.sh
+++ b/games/xroar/doinst.sh
@@ -2,3 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/xroar/slack-desc b/games/xroar/slack-desc
index 175cdc0f47..379e4f5e11 100644
--- a/games/xroar/slack-desc
+++ b/games/xroar/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-xroar: XRoar (Dragon emulator)
+xroar: xroar (emulator for 6809-based systems)
 xroar:
 xroar: XRoar is a Dragon emulator for Linux, Unix, Mac OS X, GP32, Nintendo
 xroar: DS and Windows. Due to hardware similarities, XRoar also emulates
diff --git a/games/xroar/xroar.6 b/games/xroar/xroar.6
index 6f1dbd157a..fa008367e0 100644
--- a/games/xroar/xroar.6
+++ b/games/xroar/xroar.6
@@ -11,7 +11,7 @@ emulates the Tandy Colour Computer (CoCo) models 1 & 2.
 .PP
 This man page just documents the command\-line options to xroar. For full
 documentation, see the info page for xroar, or the HTML documentation
-in /usr/doc/xroar-$VERSION/xroar.html.
+in /usr/doc/xroar-@VERSION@/xroar.html.
 .SH OPTIONS
 The first non\-option argument is taken as a filename, and treated as though
 it were given as the argument to \-run.
diff --git a/games/xroar/xroar.SlackBuild b/games/xroar/xroar.SlackBuild
index 2322ae6a02..e2b253ccb8 100644
--- a/games/xroar/xroar.SlackBuild
+++ b/games/xroar/xroar.SlackBuild
@@ -1,20 +1,29 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xroar
 
 # Written by B. Watson (yalhcru@gmail.com)
 
+# Licensed under the WTFPL. See http://sam.zoy.org/wtfpl/ for details.
+
+# 20121218 bkw:
+# - update for 0.28.1
+# - change download link to my own server, since upstream changes their URL
+#   for every release
+# - include missing .png file for HTML doc
+# - add patch to prefer ALSA over OSS
+# - LDFLAGS=-lm (wasn't needed for old version)
+# - mention gtkglext in README as an optional dep
+
 PRGNAM=xroar
-VERSION=${VERSION:-0.23b}
+VERSION=${VERSION:-0.28.1}
 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
@@ -38,16 +47,14 @@ else
   LIBDIRSUFFIX=""
 fi
 
-SRCVER=0.23
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVER
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$SRCVER
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -55,6 +62,14 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Have the emulator try ALSA before OSS. This prevents the emu from
+# taking over the ALSA device when using OSS emulation (stops other
+# apps from making any sound at all!)
+patch -p1 < $CWD/alsa_first.diff
+
+# fix underlinking via LDFLAGS instead of a .diff
+
+LDFLAGS="-lm" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -97,8 +112,9 @@ if [ ! -e $PKG/usr/share/$PRGNAM/roms/d32.rom ]; then
 	ln -s mini-dragon.rom $PKG/usr/share/$PRGNAM/roms/d32.rom
 fi
 
+# Man page written for this SlackBuild
 mkdir -p $PKG/usr/man/man6
-gzip -9c < $CWD/$PRGNAM.6 > $PKG/usr/man/man6/$PRGNAM.6.gz
+sed "s,@VERSION@,$VERSION,g" < $CWD/$PRGNAM.6 | gzip -9c > $PKG/usr/man/man6/$PRGNAM.6.gz
 
 # Icon taken from Fedora package here:
 # ftp://mirror.switch.ch/pool/3/mirror/rpmfusion/free/fedora/updates/8/i386/xroar-0.21-2.fc8.i386.rpm
@@ -110,13 +126,11 @@ cp $CWD/*.desktop $PKG/usr/share/applications
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 # Don't bother with the README: it's only about installation, not usage
-cp -a \
-  COPYING* ChangeLog \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING* ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 
 # HTML version of the info page, for those who hate info pages...
 make doc/$PRGNAM.html
-mv doc/$PRGNAM.html $PKG/usr/doc/$PRGNAM-$VERSION
+cp doc/$PRGNAM.html doc/*png $PKG/usr/doc/$PRGNAM-$VERSION
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/games/xroar/xroar.info b/games/xroar/xroar.info
index 2158f7a65a..715fc9a01d 100644
--- a/games/xroar/xroar.info
+++ b/games/xroar/xroar.info
@@ -1,8 +1,8 @@
 PRGNAM="xroar"
-VERSION="0.23b"
+VERSION="0.28.1"
 HOMEPAGE="http://www.6809.org.uk/dragon/xroar.shtml"
-DOWNLOAD="http://www.6809.org.uk/dragon/xroar-archive/xroar-0.23b.tar.gz"
-MD5SUM="0ba9e23c31b9aad6d62d2a6cac4ced2e"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/xroar-0.28.1.tar.gz"
+MD5SUM="fab66a661e618b51a9496d2def8f20fa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""