games/xroar: Updated for version 0.35.4.

Signed-off-by: B. Watson <yalhcru@gmail.com>

1 files changed, 9 insertions, 34 deletions

diff --git a/games/xroar/xroar.SlackBuild b/games/xroar/xroar.SlackBuild
index d582bbdeb9..c068ce6b19 100644
--- a/games/xroar/xroar.SlackBuild
+++ b/games/xroar/xroar.SlackBuild
@@ -6,6 +6,12 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20191130 bkw:
+# - update for 0.35.4
+# - restore the SDL1 build, now that it builds again
+# - remove the possibility of including ROMs in the package, because:
+# - make xroar-roms a required dependency
+
 # 20181201 bkw: update for 0.35.2
 
 # 20180828 bkw:
@@ -25,7 +31,7 @@
 # 20170122 bkw: update for 0.34.7
 
 PRGNAM=xroar
-VERSION=${VERSION:-0.35.2}
+VERSION=${VERSION:-0.35.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -86,16 +92,7 @@ esac
 JACKOPT="--without-jack"
 [ "${JACK:-no}" = "yes" ] && JACKOPT="--with-jack"
 
-# 20180829 bkw: SDL 1.x build is broken in xroar-0.35!  If upstream
-# fixes it, uncomment the SDL2 check below, remove SDL2 from REQUIRES
-# in the .info file, and re-add this to the README:
-
-## SDL2 - if you prefer SDL2 to SDL1, install SDL2 before building xroar.
-##   I haven't noticed any difference between xroar built with SDL1 or SDL2,
-##   but the option is there in case you need it. If SDL2 is installed,
-##   you can build without it by setting SDL2=no in the environment.
-
-#[ "${SDL2:-yes}" = "no" ] && SDL2OPT="--without-sdl2"
+[ "${SDL2:-yes}" = "no" ] && SDL2OPT="--without-sdl2"
 
 [ "${GTKGLEXT:-yes}" = "no" ] && GTKGLOPT="--without-gtkgl"
 
@@ -142,30 +139,9 @@ rm -rf $PKG/usr/share
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
 
+# include empty ROM dir
 mkdir -p $PKG/usr/share/xroar/roms
 
-# Mini-firmware. This is a freeware, incomplete implementation of the
-# Dragon32 extended BASIC, allows running at least some programs.
-# dragon.rom comes from http://www.6809.org.uk/dragon/dragon.rom
-cat $CWD/dragon.rom > $PKG/usr/share/$PRGNAM/roms/mini-dragon.rom
-
-ROMS="mini-dragon"
-# Optional ROM images (from MESS site)
-for zip in coco coco2 cocoe dragon32 dragon64; do
-  if [ -e $CWD/$zip.zip ]; then
-    rm -f *.rom
-    unzip $CWD/$zip.zip
-    install -oroot -groot -m0644 *.rom $PKG/usr/share/$PRGNAM/roms
-    ROMS="$ROMS $zip"
-  fi
-done
-
-# If the user doesn't include a d32.rom from a zip file, make the mini-rom
-# the default (at least the emu will start, that way)
-if [ ! -e $PKG/usr/share/$PRGNAM/roms/d32.rom ]; then
-  ln -s mini-dragon.rom $PKG/usr/share/$PRGNAM/roms/d32.rom
-fi
-
 # 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
 # Current versions of xroar include windows and mac icons that are larger,
@@ -191,7 +167,6 @@ mkdir -p $PKG/install
 sed -e "s,@JACK@,$JACK," \
     -e "s,@SDLVER@,$SDLVER," \
     -e "s,@GTKGLEXT@,$GTKGLEXT," \
-    -e "s,@ROMS@,$ROMS," \
     -e "s,@PULSE@,$PULSE," \
     -e "s,@OSS@,$OSS," \
     $CWD/slack-desc > $PKG/install/slack-desc