system/86box: Updated for version 4.1.

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

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

4 files changed, 31 insertions, 12 deletions

diff --git a/system/86box/86box.SlackBuild b/system/86box/86box.SlackBuild
index a14f5dda3a..f6ca964888 100644
--- a/system/86box/86box.SlackBuild
+++ b/system/86box/86box.SlackBuild
@@ -13,20 +13,25 @@
 # but it might be considered a feature (create each VM in it own
 # directory, with its own 86box.cfg).
 
-# We don't have rtmidi in the repo. The build doesn't autodetect that
-# it's missing, we have to help it out with -DRTMIDI=OFF. It's OK,
-# it'll use FluidSynth for MIDI playback.
+# We now have rtmidi in the repo. The build doesn't autodetect it and
+# disable it if it's missing, we have to help it out with -DRTMIDI=OFF
+# if needed. It's OK, it'll use FluidSynth for MIDI playback if there's
+# no rtmidi.
 
 # The linbox-qt5 frontend, despite its name, seems to require qt6 (pyside6).
 # The sl86 fronend looks too simple to be useful.
 # The other frontends are mac/windows only.
 # Anyway, it has a nice Qt GUI, I don't see why it needs a frontend.
 
+# 20240311 bkw: update for v4.1.
+# - submitted a build for rtmidi, so it's now supported here as an
+#   optional dep.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=86box
 SRCNAM=86Box
-VERSION=${VERSION:-4.0.1}
+VERSION=${VERSION:-4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -75,10 +80,15 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
+# 20240311 bkw: rtmidi still not autodetected in 4.1.
+if [ "${RTMIDI:-yes}" != "yes" ] || ! pkg-config --exists rtmidi; then
+  RTMIDI="-DRTMIDI=OFF"
+fi
+
 mkdir -p build
 cd build
   cmake \
-    -DRTMIDI=OFF \
+    $RTMIDI \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -113,13 +123,17 @@ mkdir -p $PKG/usr/share/pixmaps
 ln -s ../icons/hicolor/48x48/apps/net.86box.86Box.png \
       $PKG/usr/share/pixmaps/$PRGNAM.png
 
+# Make the slack-desc show whether option rtmidi support is built in.
+WITH=WITHOUT
+objdump -p $PKG/usr/bin/$PRGNAM | grep -q 'NEEDED.*librtmidi' && WITH="WITH"
+
 PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 mkdir -p $PKGDOC
 cp -a AUTHORS COPYING *.md $PKGDOC
 cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@WITH@,$WITH," < $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
diff --git a/system/86box/86box.info b/system/86box/86box.info
index f44edb809d..97b23319ab 100644
--- a/system/86box/86box.info
+++ b/system/86box/86box.info
@@ -1,10 +1,10 @@
 PRGNAM="86box"
-VERSION="4.0.1"
+VERSION="4.1"
 HOMEPAGE="https://86box.net/"
-DOWNLOAD="https://github.com/86Box/86Box/archive/v4.0.1/86Box-4.0.1.tar.gz \
-          https://github.com/86Box/roms/archive/v4.0.1/roms-4.0.1.tar.gz"
-MD5SUM="352758f2b198dd4f6de5f2fb6f8d6ab2 \
-        4d05fe37518ddbdbc9749788292575f4"
+DOWNLOAD="https://github.com/86Box/86Box/archive/v4.1/86Box-4.1.tar.gz \
+          https://github.com/86Box/roms/archive/v4.1/roms-4.1.tar.gz"
+MD5SUM="a209227eb5c2ca9f3c11dae1441b4468 \
+        2c04a4c1c4ec140a6d5dcfc54d882027"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libslirp"
diff --git a/system/86box/README b/system/86box/README
index 0d7e59bb2c..1dd2c54f7e 100644
--- a/system/86box/README
+++ b/system/86box/README
@@ -25,3 +25,8 @@ The package includes the ROM images required for emulation.
 
 Full documentation is available at:
 https://86box.readthedocs.io/en/latest/index.html
+
+Optional dependency: rtmidi (autodetected). If rtmidi is installed
+at build time, 86box will be buit with support for it. If you have
+rtmidi installed but want to build without it, export RTMIDI=no in the
+environment.
diff --git a/system/86box/slack-desc b/system/86box/slack-desc
index ad90ce4687..a7d66de4f8 100644
--- a/system/86box/slack-desc
+++ b/system/86box/slack-desc
@@ -12,7 +12,7 @@
 86box: and software designed for IBM PC systems and compatibles from 1981
 86box: through fairly recent system designs based on the PCI bus.
 86box:
-86box:
+86box: This package was built @WITH@ rtmidi support.
 86box:
 86box:
 86box: