Update CDEmu software series

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

13 files changed, 89 insertions, 81 deletions

diff --git a/libraries/libmirage/libmirage-3.2.4-gcc-10.patch b/libraries/libmirage/libmirage-3.2.4-gcc-10.patch
deleted file mode 100644
index 7834e39eed..0000000000
--- a/libraries/libmirage/libmirage-3.2.4-gcc-10.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7288d06f79d935798b917f707b86a33f5b69125a Mon Sep 17 00:00:00 2001
-From: Rok Mandeljc <rok.mandeljc@gmail.com>
-Date: Sat, 2 May 2020 17:37:34 +0200
-Subject: [PATCH] libMirage: utils.h: added missing extern specifiers
-
-The lack thereof seems to be causing errors with gcc 10 on Fedora 32.
----
- libmirage/mirage/utils.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libmirage/mirage/utils.h b/libmirage/mirage/utils.h
-index 64611810..fc431d2f 100644
---- a/mirage/utils.h
-+++ b/mirage/utils.h
-@@ -83,8 +83,8 @@ gchar mirage_helper_isrc2ascii (guint8 c);
- gboolean mirage_helper_validate_isrc (const gchar *isrc);
- 
- /* CRC utility functions */
--guint16 *crc16_1021_lut;
--guint32 *crc32_d8018001_lut;
-+extern guint16 *crc16_1021_lut;
-+extern guint32 *crc32_d8018001_lut;
- 
- guint16 *mirage_helper_init_crc16_lut (guint16 genpoly);
- guint32 *mirage_helper_init_crc32_lut (guint32 genpoly, guint slices);
-@@ -139,7 +139,7 @@ const gchar *mirage_helper_encoding_from_bom (const guint8 *buffer);
- 
- 
- /* ECMA-130 Annex B sector data scrambler */
--guint8 *ecma_130_scrambler_lut;
-+extern guint8 *ecma_130_scrambler_lut;
- 
- guint8 *mirage_helper_init_ecma_130b_scrambler_lut (void);
- 
diff --git a/libraries/libmirage/libmirage.SlackBuild b/libraries/libmirage/libmirage.SlackBuild
index 6bb8b88fcd..ab06c5dfe1 100644
--- a/libraries/libmirage/libmirage.SlackBuild
+++ b/libraries/libmirage/libmirage.SlackBuild
@@ -4,7 +4,7 @@
 #
 # Copyright 2008 Niklas "Nille" Åkerström
 # Copyright 2010-2013 Niels Horn, Rio de Janeiro, RJ, Brazil <niels.horn@gmail.com>
-# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2018-2022 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=libmirage
-VERSION=${VERSION:-3.2.4}
+VERSION=${VERSION:-3.2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -72,7 +72,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -81,8 +81,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 < $CWD/libmirage-3.2.4-gcc-10.patch
-
 mkdir -p build
 cd build
   cmake \
diff --git a/libraries/libmirage/libmirage.info b/libraries/libmirage/libmirage.info
index ca2ae4928d..1474299721 100644
--- a/libraries/libmirage/libmirage.info
+++ b/libraries/libmirage/libmirage.info
@@ -1,8 +1,8 @@
 PRGNAM="libmirage"
-VERSION="3.2.4"
+VERSION="3.2.6"
 HOMEPAGE="https://cdemu.sourceforge.io/about/libmirage/"
-DOWNLOAD="https://downloads.sourceforge.net/cdemu/libmirage-3.2.4.tar.bz2"
-MD5SUM="2be48cbe97ecfd886471038b6c2c3bf2"
+DOWNLOAD="https://downloads.sourceforge.net/cdemu/libmirage-3.2.6.tar.xz"
+MD5SUM="421d251cb7acd615c91f120e957559dd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/cdemu-client/cdemu-client.SlackBuild b/system/cdemu-client/cdemu-client.SlackBuild
index 60db858358..4a5d06a697 100644
--- a/system/cdemu-client/cdemu-client.SlackBuild
+++ b/system/cdemu-client/cdemu-client.SlackBuild
@@ -4,7 +4,7 @@
 # command-line client for cdemu-daemon
 
 # Copyright 2010-2013 Niels Horn, Rio de Janeiro, RJ, Brazil <niels.horn@gmail.com>
-# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2018-2022 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=cdemu-client
-VERSION=${VERSION:-3.2.4}
+VERSION=${VERSION:-3.2.5}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -53,7 +53,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/cdemu-client/cdemu-client.info b/system/cdemu-client/cdemu-client.info
index 217ea97027..e314bfa6a8 100644
--- a/system/cdemu-client/cdemu-client.info
+++ b/system/cdemu-client/cdemu-client.info
@@ -1,8 +1,8 @@
 PRGNAM="cdemu-client"
-VERSION="3.2.4"
+VERSION="3.2.5"
 HOMEPAGE="https://cdemu.sourceforge.io/about/client/"
-DOWNLOAD="https://downloads.sourceforge.net/cdemu/cdemu-client-3.2.4.tar.bz2"
-MD5SUM="5eadc5691fabfc7c54e926d5d1ceb8bc"
+DOWNLOAD="https://downloads.sourceforge.net/cdemu/cdemu-client-3.2.5.tar.xz"
+MD5SUM="965b27c5b36848c3420740c92fd64aad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cdemu-daemon"
diff --git a/system/cdemu-daemon/cdemu-daemon.SlackBuild b/system/cdemu-daemon/cdemu-daemon.SlackBuild
index 136050e531..514b798a13 100644
--- a/system/cdemu-daemon/cdemu-daemon.SlackBuild
+++ b/system/cdemu-daemon/cdemu-daemon.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2008 Niklas "Nille" Åkerström
 # Copyright 2010-2013 Niels Horn, Rio de Janeiro, RJ, Brazil <niels.horn@gmail.com>
-# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2018-2022 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=cdemu-daemon
-VERSION=${VERSION:-3.2.4}
+VERSION=${VERSION:-3.2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -74,7 +74,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -96,23 +96,29 @@ cd build
   make install DESTDIR=$PKG
 cd ..
 
-# Fix standard configuration to make it more "Slackware"-like
-sed \
-  -e "/^LOG_FILE/s|/tmp/|/var/log/|" \
-  -e "/^CONFIG_FILE/s|/etc/sysconfig/|/etc/|" \
-  -i $PKG/usr/libexec/$PRGNAM-system.sh
-
-# Fix a silly error in the dbus file
-sed \
-  -e "/^Name=/s/CdemuDaemon/CDEmuDaemon/" \
-  -i $PKG/usr/share/dbus-1/system-services/net.sf.cdemu.CDEmuDaemon.service
-
 # Install init script
 mkdir -p $PKG/etc/rc.d
 install -m 0755 $CWD/rc.cdemud $PKG/etc/rc.d/rc.cdemud.new
 
-# dbus and udev rules
-mv $PKG/etc/dbus-1/system.d/cdemu-daemon-dbus.conf \
+# Install systemd sample services
+mkdir -p $PKG/usr/lib/systemd/user
+cp $TMP/$PRGNAM-$VERSION/service-example/cdemu-daemon.service \
+  $PKG/usr/lib/systemd/user/cdemu-daemon.service
+mkdir -p $PKG/usr/share/dbus-1/services
+cp $TMP/$PRGNAM-$VERSION/service-example/net.sf.cdemu.CDEmuDaemon.service \
+  $PKG/usr/share/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service
+
+# Adapt systemd service for Slackware
+sed \
+  -e "/^SystemdService/d" \
+  -e "/^Exec=/s|/bin/true|/usr/libexec/cdemu-daemon-session.sh|" \
+  -i $PKG/usr/share/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service
+mkdir -p $PKG/usr/libexec
+cp $CWD/config/cdemu-daemon-session.sh $PKG/usr/libexec/cdemu-daemon-session.sh
+
+# Install dbus and udev rules
+mkdir -p $PKG/etc/dbus-1/system.d
+cp $CWD/config/cdemu-daemon-dbus.conf \
   $PKG/etc/dbus-1/system.d/cdemu-daemon-dbus.conf.new
 sed -i 's/group="root"/group="'$GROUP'"/' \
   $PKG/etc/dbus-1/system.d/cdemu-daemon-dbus.conf.new
diff --git a/system/cdemu-daemon/cdemu-daemon.info b/system/cdemu-daemon/cdemu-daemon.info
index 3a27c0b19b..25b7e9156a 100644
--- a/system/cdemu-daemon/cdemu-daemon.info
+++ b/system/cdemu-daemon/cdemu-daemon.info
@@ -1,8 +1,8 @@
 PRGNAM="cdemu-daemon"
-VERSION="3.2.4"
+VERSION="3.2.6"
 HOMEPAGE="https://cdemu.sourceforge.io/about/daemon/"
-DOWNLOAD="https://downloads.sourceforge.net/cdemu/cdemu-daemon-3.2.4.tar.bz2"
-MD5SUM="9021f56fd95686f5b14d3b32f68e7b1a"
+DOWNLOAD="https://downloads.sourceforge.net/cdemu/cdemu-daemon-3.2.6.tar.xz"
+MD5SUM="21c8d2b4e8952999628ed755304b1b0f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libmirage vhba-module"
diff --git a/system/cdemu-daemon/config/cdemu-daemon-dbus.conf b/system/cdemu-daemon/config/cdemu-daemon-dbus.conf
new file mode 100644
index 0000000000..c450d78cf0
--- /dev/null
+++ b/system/cdemu-daemon/config/cdemu-daemon-dbus.conf
@@ -0,0 +1,19 @@
+<!DOCTYPE busconfig PUBLIC
+    "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+    "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+    <!-- Only root can own the CDEmuDaemon service on bus -->
+    <policy user="root">
+        <allow own="net.sf.cdemu.CDEmuDaemon"/>
+    </policy>
+    <policy group="root">
+        <allow own="net.sf.cdemu.CDEmuDaemon"/>
+    </policy>
+
+    <!-- Allow anyone to invoke methods on the interface -->
+    <policy context="default">
+        <allow send_destination="net.sf.cdemu.CDEmuDaemon"/>
+    </policy>
+</busconfig>
+
diff --git a/system/cdemu-daemon/config/cdemu-daemon-session.sh b/system/cdemu-daemon/config/cdemu-daemon-session.sh
new file mode 100755
index 0000000000..c533612a73
--- /dev/null
+++ b/system/cdemu-daemon/config/cdemu-daemon-session.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Starts the CDEmu daemon instance on D-Bus *session* bus. Optional
+# configuration (number of devices, audio driver, log file) are read
+# from ~/.cdemu-daemon
+
+# Default settings
+NUM_DEVICES=1
+AUDIO_DRIVER=default
+LOG_FILE=~/.cdemu-daemon.log
+
+# Read the settings
+CONFIG_FILE=~/.cdemu-daemon
+
+if [ -f ${CONFIG_FILE} ]; then
+    . ${CONFIG_FILE};
+fi
+
+# Start the daemon
+exec cdemu-daemon --ctl-device=/dev/vhba_ctl --bus=session --num-devices=${NUM_DEVICES} --audio-driver=${AUDIO_DRIVER} --logfile=${LOG_FILE}
diff --git a/system/gcdemu/gcdemu.SlackBuild b/system/gcdemu/gcdemu.SlackBuild
index 1ccf60cac0..0e56fae874 100644
--- a/system/gcdemu/gcdemu.SlackBuild
+++ b/system/gcdemu/gcdemu.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for gcdemu
 #
 # Copyright 2013 Niels Horn, Rio de Janeiro, RJ, Brazil <niels.horn@gmail.com>
-# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2018-2022 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,9 +26,9 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gcdemu
-VERSION=${VERSION:-3.2.4}
+VERSION=${VERSION:-3.2.6}
 ARCH=noarch
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -50,7 +50,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/gcdemu/gcdemu.info b/system/gcdemu/gcdemu.info
index efc38a790c..4d3d405ab1 100644
--- a/system/gcdemu/gcdemu.info
+++ b/system/gcdemu/gcdemu.info
@@ -1,8 +1,8 @@
 PRGNAM="gcdemu"
-VERSION="3.2.4"
+VERSION="3.2.6"
 HOMEPAGE="https://cdemu.sourceforge.io/about/gcdemu/"
-DOWNLOAD="https://downloads.sourceforge.net/cdemu/gcdemu-3.2.4.tar.bz2"
-MD5SUM="942e8b223985a67fb8096c44fdc40df4"
+DOWNLOAD="https://downloads.sourceforge.net/cdemu/gcdemu-3.2.6.tar.xz"
+MD5SUM="7a699b83d8cc68f74c8f9f1c57ed6c00"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cdemu-daemon"
diff --git a/system/image-analyzer/image-analyzer.SlackBuild b/system/image-analyzer/image-analyzer.SlackBuild
index b17d3185b6..f80f2b78c9 100644
--- a/system/image-analyzer/image-analyzer.SlackBuild
+++ b/system/image-analyzer/image-analyzer.SlackBuild
@@ -4,7 +4,7 @@
 # Application to display tree structure of disc images
 
 # Copyright 2010-2013 Niels Horn, Rio de Janeiro, RJ, Brazil <niels.horn@gmail.com>
-# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2018-2022 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=image-analyzer
-VERSION=${VERSION:-3.2.4}
+VERSION=${VERSION:-3.2.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -74,7 +74,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/image-analyzer/image-analyzer.info b/system/image-analyzer/image-analyzer.info
index c5822408b7..cd6cec4a07 100644
--- a/system/image-analyzer/image-analyzer.info
+++ b/system/image-analyzer/image-analyzer.info
@@ -1,8 +1,8 @@
 PRGNAM="image-analyzer"
-VERSION="3.2.4"
-HOMEPAGE="https://cdemu.sourceforge.net/about/analyzer/"
-DOWNLOAD="https://downloads.sourceforge.net/cdemu/image-analyzer-3.2.4.tar.bz2"
-MD5SUM="ae7cb81e5909805bf96ce9dfa3ad1328"
+VERSION="3.2.5"
+HOMEPAGE="https://cdemu.sourceforge.io/about/analyzer/"
+DOWNLOAD="https://downloads.sourceforge.net/cdemu/image-analyzer-3.2.5.tar.xz"
+MD5SUM="c192392c2b6f8ae1365cc55b872d0fe9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libmirage cairocffi python3-matplotlib"