8 files changed, 57 insertions, 33 deletions
diff --git a/games/xroar/README b/games/xroar/README
index 984eac16fd..35880e4f6a 100644
--- a/games/xroar/README
+++ b/games/xroar/README
@@ -1,9 +1,9 @@
 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. For more information on the
-Dragon and CoCo computers, see:
+XRoar emulates the Dragon 32/64; Tandy Colour Computers 1, 2 and 3;
+the Tandy MC-10; and some other similar machines or clones. It runs
+on a wide variety of platforms. 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
diff --git a/games/xroar/README_SBo.txt b/games/xroar/README_SBo.txt
index ec19bf5505..0f685f6196 100644
--- a/games/xroar/README_SBo.txt
+++ b/games/xroar/README_SBo.txt
@@ -1,20 +1,31 @@
+xroar supports multiple audio systems and has two user interfaces,
+gtk2 (using gtkglext) and sdl2 (very bare-bones; no menus). By
+default, both UIs are built, as is support for PulseAudio and plain
+ALSA audio. For most users, these defaults are just fine. If you have
+different needs, read on.
+
 Optional Dependencies
 =====================
 
-jack - if you want to use JACK for audio output, install jack and set
+jack - If you want to use JACK for audio output, install jack 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'.
+  If you don't know what jack is, or why you might want to use it, then
+  you don't want it.
 
 
 Environment Variables
 =====================
 
+JACK - see above. Default: no.
+
 GTKGLEXT - If you have gtkglext installed, but don't want to build
-  xroar with it, export GTKGLEXT=no [1] [2].
+  xroar with it, export GTKGLEXT=no [1] [2]. Default: yes.
 
 SDL2 - If you don't want to build xroar with SDL2, export SDL2=no [2].
-  This will remove the "-ui sdl" option, which is probably of no
-  consequence since the SDL user interface isn't very featureful.
+  This will remove the "-ui sdl" option, which is probably
+  of no consequence since the SDL user interface isn't very
+  featureful. Default: yes.
 
 OSS - use OSS for audio? Default is "no", export OSS="yes" to enable.
   Most users won't need this.
diff --git a/games/xroar/douninst.sh b/games/xroar/douninst.sh
index cc363b1b71..bd5d05ef99 100644
--- a/games/xroar/douninst.sh
+++ b/games/xroar/douninst.sh
@@ -1,17 +1,16 @@
-# 20211015 bkw: I was going to have a douninst.sh that runs
-# /usr/bin/install-info --delete /usr/info/xroar.info.gz /usr/info/dir
-# but this won't work because removepkg has already deleted
-# /usr/info/xroar.info.gz before it runs douninst.sh. And you can't
-# use install-info to remove stuff *by name* from /usr/info/dir;
-# the info file must actually exist.
-# So the script has to manually remove the entry from the info dir,
-# and the Emulators section if it's become empty.
+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/info/dir ]; then
-  # Remove the entry first:
-  sed -i '/^\* XRoar:/d' usr/info/dir
-  # If the Emulators section is empty now, remove it too:
-  if grep -A1 '^Emulators$' usr/info/dir | tail -1 | grep -q '^$'; then
-    sed -i '/^Emulators$/,+1d' usr/info/dir
+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
+
+if [ -x /usr/bin/install-info -a -d usr/info ]; then
+  ( cd usr/info
+    rm -f dir
+    for i in *.info*; do /usr/bin/install-info $i dir 2>/dev/null; done
+  )
+fi
diff --git a/games/xroar/icons/22.png b/games/xroar/icons/22.png
new file mode 100644
index 0000000000..051b55aa8e
--- /dev/null
+++ b/games/xroar/icons/22.png
diff --git a/games/xroar/icons/64.png b/games/xroar/icons/64.png
new file mode 100644
index 0000000000..fae6a8aecd
--- /dev/null
+++ b/games/xroar/icons/64.png
diff --git a/games/xroar/slack-desc b/games/xroar/slack-desc
index 4a27a9c5ab..4b844ed3a6 100644
--- a/games/xroar/slack-desc
+++ b/games/xroar/slack-desc
@@ -8,9 +8,9 @@
      |-----handy-ruler------------------------------------------------------|
 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
-xroar: the Tandy Colour Computer (CoCo) models 1 & 2.
+xroar: XRoar emulates the Dragon 32/64; Tandy Colour Computers 1, 2 and 3;
+xroar: the Tandy MC-10; and some other similar machines or clones. It runs
+xroar: on a wide variety of platforms.
 xroar:
 xroar: This package is built with:
 xroar:     GtkGLExt: @GTKGLEXT@ |      SDL2: @SDL2@ |
diff --git a/games/xroar/xroar.SlackBuild b/games/xroar/xroar.SlackBuild
index f4bd852f12..422b078b3d 100644
--- a/games/xroar/xroar.SlackBuild
+++ b/games/xroar/xroar.SlackBuild
@@ -2,10 +2,20 @@
 
 # Slackware build script for xroar
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20240314 bkw: update for 1.5.4
+# 20240216 bkw: update for 1.5.3
+# 20230907 bkw: update for 1.4.2
+# - add 22x22 and 64x64 icons.
+# - reword README and slack-desc (use text from the man page).
+
+# 20230308 bkw: BUILD=2, de-uglify douninst.sh.
+# 20230214 bkw: update for 1.3.1
+# 20230109 bkw: update for 1.3
+
 # 20211015 bkw:
 # - update for 0.37.1
 # - new-style icons
@@ -22,7 +32,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xroar
-VERSION=${VERSION:-0.37.1}
+VERSION=${VERSION:-1.5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -126,7 +136,10 @@ strip $PKG/usr/games/$PRGNAM
 # reset these for use in the slack-desc
 SDL2=no; JACK=no; GTKGLEXT=no; PULSE=no; OSS=no
 
-# actually examine the binary to figure out build options.
+# actually examine the binary to figure out build options. this may
+# seem like overkill, but it's very handy when updating to new xroar
+# versions (if the slack-desc doesn't match the environment, something
+# has changed in xroar and this script needs fixing).
 ldd $PKG/usr/games/$PRGNAM > ldd.tmp
 grep -q libSDL2 ldd.tmp     && SDL2=yes
 grep -q libjack ldd.tmp     && JACK=yes
@@ -153,6 +166,7 @@ mkdir -p $PKG/usr/share/xroar/roms
 # as a 32x32 PNG, which is smaller than a postage stamp on most
 # modern displays and doesn't scale up nicely. Besides which, these
 # are upstream's official icons.
+# 20230907 bkw: added 22x22 and 64x64 icons.
 for i in $CWD/icons/*.png; do
   px=$( basename $i | cut -d. -f1 )
   size=${px}x${px}
diff --git a/games/xroar/xroar.info b/games/xroar/xroar.info
index 0d3928ba49..4c83eafd13 100644
--- a/games/xroar/xroar.info
+++ b/games/xroar/xroar.info
@@ -1,10 +1,10 @@
 PRGNAM="xroar"
-VERSION="0.37.1"
-HOMEPAGE="http://www.6809.org.uk/dragon/xroar.shtml"
-DOWNLOAD="http://www.6809.org.uk/xroar/dl/xroar-0.37.1.tar.gz"
-MD5SUM="2063beee92be8370706d09422c2d9970"
+VERSION="1.5.4"
+HOMEPAGE="https://www.6809.org.uk/dragon/xroar.shtml"
+DOWNLOAD="https://www.6809.org.uk/xroar/dl/xroar-1.5.4.tar.gz"
+MD5SUM="6f00edbe9d24226d93b8c36e3dd873b1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gtkglext xroar-roms"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"