system/sdltrs: Updated for version 1.2.30.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 32 insertions, 9 deletions

diff --git a/system/sdltrs/README b/system/sdltrs/README
index f3b219e8d06b4..341f3c681c223 100644
--- a/system/sdltrs/README
+++ b/system/sdltrs/README
@@ -11,6 +11,12 @@ in the last 10 years or so, you probably should be using the SDL-2.0
 build, which is called sdl2trs. It's possible to install both sdltrs
 and sdl2trs on the same system without conflict.
 
+Optionally, sdltrs can be built without X11 support. Set X11=no in
+the script's environment, to do this. This will make it possible
+to run sdltrs directly on the console's framebuffer, or (probably)
+under Wayland. However, the X libraries will still be required at
+runtime because Slackware's SDL is linked with them.
+
 Note: When you start up sdltrs for the first time, it attempts
 to boot from floppy disk. If you didn't give either the "-disk0
 /path/to/image.dsk" or "-nofloppy" options on the command line, it
diff --git a/system/sdltrs/doinst.sh b/system/sdltrs/doinst.sh
index 3e5691a052b5b..78656e3765730 100644
--- a/system/sdltrs/doinst.sh
+++ b/system/sdltrs/doinst.sh
@@ -7,3 +7,5 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
+
+chroot . /usr/bin/mandb -f /usr/man/man6/sdltrs.6.gz &> /dev/null
diff --git a/system/sdltrs/sdltrs.SlackBuild b/system/sdltrs/sdltrs.SlackBuild
index 577617d316a5b..297233bb89dfc 100644
--- a/system/sdltrs/sdltrs.SlackBuild
+++ b/system/sdltrs/sdltrs.SlackBuild
@@ -4,7 +4,7 @@
 # the Radio Shack TRS-80 Model I/III/4/4p emulator
 
 # Copyright 2009-2010, 2012 Niels Horn, Rio de Janeiro, Brazil
-# Copyright 2023, B. Watson
+# Copyright 2023-2024, B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,6 +24,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20240911 bkw:
+# - update for v1.2.30.
+# - support building without X, for console or Wayland use.
+# - add mandb -f to doinst.sh.
+
 # 20240817 bkw: update for v1.2.29.
 
 # 20240311 bkw, BUILD=2: having heard from upstream... the proper SDL2
@@ -67,7 +72,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=sdltrs
-VERSION=${VERSION:-1.2.29}
+VERSION=${VERSION:-1.2.30}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -116,15 +121,25 @@ chown -R root:root .
 find . -type f -a -exec chmod 644 {} + -o \
        -type d -a -exec chmod 755 {} +
 
-# 20230417 bkw: Look in system-wide ROM directory by default.
-sed -i '/strcpy(romfile/s, ", "/usr/share/trs80-roms/,' src/trs_sdl_interface.c
+# 20240911 bkw: wayland support? works on the console, for real!
+NOX="false"; WITHX="WITH"
+if [ "${X11:-yes}" = "no" ]; then
+  NOX="true"
+  WITHX="WITHOUT"
+fi
 
+# 20240911 bkw: upstream now has a meson option for the ROM path,
+# so no more crude sed hackery. however, meson doesn't add the
+# double-quotes that the compiler needs, so we have to quote it
+# here. also, the trailing slash is *required*.
 mkdir build
 cd build
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   meson .. \
     -DSDL1=true \
+    -DROM_PATH='"/usr/share/trs80-roms/"' \
+    -DNOX=$NOX \
     --buildtype=release \
     --infodir=/usr/info \
     --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -174,7 +189,7 @@ cp -a CHANGELOG.md README.md *LICENSE utilities html $PKGDOC
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@WITHX@,$WITHX," < $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
diff --git a/system/sdltrs/sdltrs.info b/system/sdltrs/sdltrs.info
index e5143e62f12fd..11d07f55817ba 100644
--- a/system/sdltrs/sdltrs.info
+++ b/system/sdltrs/sdltrs.info
@@ -1,8 +1,8 @@
 PRGNAM="sdltrs"
-VERSION="1.2.29"
+VERSION="1.2.30"
 HOMEPAGE="https://gitlab.com/jengun/sdltrs/"
-DOWNLOAD="https://gitlab.com/jengun/sdltrs/-/archive/1.2.29/sdltrs-1.2.29.tar.bz2"
-MD5SUM="cb15645f003cf921853d46f8731c8063"
+DOWNLOAD="https://gitlab.com/jengun/sdltrs/-/archive/1.2.30/sdltrs-1.2.30.tar.bz2"
+MD5SUM="a44d9ceb55e4d8977676c3510eb22e7e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="trs80-roms"
diff --git a/system/sdltrs/slack-desc b/system/sdltrs/slack-desc
index a8cb6ad9e01b4..2f8d7bc218ae4 100644
--- a/system/sdltrs/slack-desc
+++ b/system/sdltrs/slack-desc
@@ -13,7 +13,7 @@ sdltrs: Macintosh OSX, Windows and Linux. It has been ported from the
 sdltrs: excellent X-Windows Unix emulator xtrs. Instead of using the
 sdltrs: X-Window system for graphics, it uses the portable SDL library.
 sdltrs:
-sdltrs:
+sdltrs: This package built @WITHX@ X11 support.
 sdltrs:
 sdltrs:
 sdltrs: