5 files changed, 28 insertions, 67 deletions
diff --git a/games/xroar/README b/games/xroar/README
index 841ac802da145..2f9849e235e66 100644
--- a/games/xroar/README
+++ b/games/xroar/README
@@ -2,18 +2,28 @@ 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.
+Tandy Colour Computer (CoCo) models 1 & 2. For more information on the
+Dragon and CoCo computers, see:
+
+http://en.wikipedia.org/wiki/TRS-80_Color_Computer
+http://archive.worldofdragon.org/index.php?title=Main_Page
+http://archive.worldofdragon.org/archive/index.php
 
 Optional dependencies:
 
+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.
+
 gtkglext - if you want a full GTK+ user interface, install gtkglext
   before building xroar. If gtkglext is installed, you can build
   without it by setting GTKGLEXT=no in the environment.
 
 jack-audio-connection-kit - if you want to use JACK for audio output,
-  install jack-audio-connection-kit and set JACK=yes in the
-  environment before building xroar. If JACK audio has x-runs,
-  try 'setcap cap_ipc_lock,cap_sys_nice=ep /usr/bin/xroar'.
+  install jack-audio-connection-kit (or jack2; untested) and set JACK=yes
+  in the environment before building xroar. If JACK audio has x-runs,
+  try 'setcap cap_ipc_lock,cap_sys_nice=ep /usr/games/xroar'.
 
 Other build options (environment variables):
 
@@ -21,27 +31,3 @@ OSS - use OSS for audio? Default is "no", export OSS="yes" to enable.
       Most users won't need this.
 
 PULSE - use PulseAudio? Default is "yes", export PULSE="no" to disable.
-
-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-$VERSION/xroar.html for details
-on ROM files.
-
-If you want to include ROM images in the package, get the files
-"coco.zip", "coco2.zip", "cocoe.zip", "dragon32.zip", and/or
-"dragon64.zip" from any site that carries MESS BIOS images. Place them
-in the directory with the SlackBuild script before running it. The
-resulting package cannot be redistributed (that would violate both the
-GPL and the original copyright on the ROM images).
-
-If you don't include the ROM images, it's still possible to run
-some Dragon32 software: the package includes a freeware ROM image
-(mini-dragon.rom) that partly reimplements the original ROM code. This
-is enough to run at least some cartridge-based games.
-
-More information on the Dragon and CoCo computers:
-
-http://en.wikipedia.org/wiki/TRS-80_Color_Computer
-http://archive.worldofdragon.org/index.php?title=Main_Page
-http://archive.worldofdragon.org/archive/index.php
diff --git a/games/xroar/dragon.rom b/games/xroar/dragon.rom
deleted file mode 100644
index b0e4fdff125a5..0000000000000
--- a/games/xroar/dragon.rom
+++ /dev/null
diff --git a/games/xroar/slack-desc b/games/xroar/slack-desc
index b2c656dbf9941..c87520bc5fda2 100644
--- a/games/xroar/slack-desc
+++ b/games/xroar/slack-desc
@@ -16,4 +16,4 @@ xroar: This package is built with:
 xroar: SDL version: @SDLVER@ | GtkGLExt: @GTKGLEXT@
 xroar: PulseAudio: @PULSE@ | OSS audio: @OSS@ | JACK audio: @JACK@
 xroar:
-xroar: Included ROMs: @ROMS@
+xroar:
diff --git a/games/xroar/xroar.SlackBuild b/games/xroar/xroar.SlackBuild
index d582bbdeb9835..c068ce6b19d0e 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
diff --git a/games/xroar/xroar.info b/games/xroar/xroar.info
index e135d5aa27aed..f40281e8f7e67 100644
--- a/games/xroar/xroar.info
+++ b/games/xroar/xroar.info
@@ -1,10 +1,10 @@
 PRGNAM="xroar"
-VERSION="0.35.2"
+VERSION="0.35.4"
 HOMEPAGE="http://www.6809.org.uk/dragon/xroar.shtml"
-DOWNLOAD="http://www.6809.org.uk/xroar/dl/0.35/xroar-0.35.2.tar.gz"
-MD5SUM="7290fc20830817eaf2208674692bf236"
+DOWNLOAD="http://www.6809.org.uk/xroar/dl/0.35/xroar-0.35.4.tar.gz"
+MD5SUM="072fb6c260840ff6e6f12083a4907939"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL2"
+REQUIRES="xroar-roms"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"