desktop/wmix: Updated for version 3.5, new maintainer.

Signed-off-by: B. Watson <yalhcru@gmail.com>

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

7 files changed, 104 insertions, 36 deletions

diff --git a/desktop/wmix/README b/desktop/wmix/README
index bc30be7d5190..15f8b44abd2d 100644
--- a/desktop/wmix/README
+++ b/desktop/wmix/README
@@ -1,8 +1,10 @@
+wmix (dockapp mixer)
+
 Dockapp mixer for OSS or ALSA.
 
 Allows toggling record source, muting individual channels, adjusting
 volume and balance, all in a compact dockapp size, with TV-like
-on-screen-display for volume levels.  Supports mousewheel to adjust
+on-screen-display for volume levels. Supports mousewheel to adjust
 current channel volume, and can be controlled remotely with SIGUSR1 /
-SIGUSR2 to adjust the volume, too.  Can use a configuration file to
+SIGUSR2 to adjust the volume, too. Can use a configuration file to
 control some of the features.
diff --git a/desktop/wmix/doinst.sh b/desktop/wmix/doinst.sh
new file mode 100644
index 000000000000..3e5691a052b5
--- /dev/null
+++ b/desktop/wmix/doinst.sh
@@ -0,0 +1,9 @@
+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/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
diff --git a/desktop/wmix/manpage.diff b/desktop/wmix/manpage.diff
new file mode 100644
index 000000000000..ccd43815944f
--- /dev/null
+++ b/desktop/wmix/manpage.diff
@@ -0,0 +1,44 @@
+diff -Naur wmix-3.5/wmix.1x wmix-3.5.patched/wmix.1x
+--- wmix-3.5/wmix.1x	2019-05-10 06:04:53.000000000 -0400
++++ wmix-3.5.patched/wmix.1x	2022-02-08 13:03:35.228542615 -0500
+@@ -1,4 +1,4 @@
+-.TH wmix 1x "3.2" "Fredrik Steen"
++.TH wmix 1x "3.5" "Fredrik Steen"
+ .SH NAME
+ wmix \- Dockapp mixer for OSS or ALSA
+ .
+@@ -24,6 +24,9 @@
+ .
+ .SH OPTIONS
+ .TP
++\fB\-a\fR <\fIapi\fP>
++Use this sound API (\fIoss\fP or \fIalsa\fP, default is \fIalsa\fP).
++.TP
+ \fB\-d\fR <\fIdisplay\fP>
+ Connect to remote X display
+ .TP
+@@ -47,8 +50,8 @@
+ below)
+ .TP
+ \fB\-m\fR <\fIdevice\fP>
+-Use specified mixer device instead of
+-.I /dev/mixer
++For oss, use specified mixer device instead of \fI/dev/mixer\fP.
++For alsa, use specified card name instead of \fIdefault\fP.
+ .TP
+ \fB\-v\fR
+ Verbose start, report detected channels
+@@ -58,8 +61,12 @@
+ is read on startup.
+ It may contains one configuration command per line:
+ .TP
++api=<\fIapi\fP>
++Use this sound API (same as \fB\-a\fR option).
++.TP
+ device=<\fImixer_device\fP>
+-defines the device file to use instead of \fB/dev/mixer\fP
++For oss, defines the device file to use instead of \fB/dev/mixer\fP.
++For alsa, defines the audio card to use instead of \fBdefault\fP.
+ .TP
+ exclude=<\fIchannel_name\fP>
+ exclude the specified channel from control, you can use it as many times as needed (see
diff --git a/desktop/wmix/slack-desc b/desktop/wmix/slack-desc
index 068e2bb1cd6b..eb5ac64dc708 100644
--- a/desktop/wmix/slack-desc
+++ b/desktop/wmix/slack-desc
@@ -8,12 +8,12 @@
     |-----handy-ruler------------------------------------------------------|
 wmix: wmix (dockapp mixer)
 wmix:
-wmix: Dockapp mixer for OSS or ALSA. Allows toggling record source, muting
-wmix: individual channels, adjusting volume and balance, all in a compact
-wmix: dockapp size, with TV-like on-screen-display for volume levels.
-wmix: Supports mousewheel to adjust current channel volume, and can be
-wmix: controlled remotely with SIGUSR1 / SIGUSR2 to adjust the volume, too.
-wmix:
-wmix:
+wmix: Dockapp mixer for OSS or ALSA.
 wmix:
+wmix: Allows toggling record source, muting individual channels, adjusting
+wmix: volume and balance, all in a compact dockapp size, with TV-like
+wmix: on-screen-display for volume levels. Supports mousewheel to adjust
+wmix: current channel volume, and can be controlled remotely with SIGUSR1 /
+wmix: SIGUSR2 to adjust the volume, too. Can use a configuration file to
+wmix: control some of the features.
 wmix:
diff --git a/desktop/wmix/wmix.SlackBuild b/desktop/wmix/wmix.SlackBuild
index a4e39cda4a41..f7b6511b5802 100644
--- a/desktop/wmix/wmix.SlackBuild
+++ b/desktop/wmix/wmix.SlackBuild
@@ -22,10 +22,20 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Now maintained by B. Watson <yalhcru@gmail.com>
+
+# 20220208 bkw:
+# - take over maintenance.
+# - update for v3.5.
+# - add an icon and doinst.sh
+# - don't install useless INSTALL in doc dir.
+# - do install sample.wmixrc in doc dir.
+# - add missing option to the man page.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=wmix
-VERSION=${VERSION:-3.4}
+VERSION=${VERSION:-3.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -38,9 +48,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -70,14 +77,21 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20220208 bkw: make the .desktop validate, clean up the description,
+# and add the icon.
+sed -i -e '/^Categories/s|$|;AudioVideo|' \
+       -e 's/using the.*/for ALSA or OSS/' \
+       -e '$aIcon=wmix' \
+    $PRGNAM.desktop
+
+# 20220208 bkw: document the -a option and api= config command.
+patch -p1 < $CWD/manpage.diff
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -91,24 +105,23 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-sed -i '/^Categories/s|$|;AudioVideo|' $PKG/usr/share/applications/wmix.desktop
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip -9 $PKG/usr/man/man?/*
 
+# 20220208 bkw: icon made by editing a screenshot of the dockapp.
+mkdir -p $PKG/usr/share/icons/hicolor/32x32/apps $PKG/usr/share/pixmaps
+cat $CWD/$PRGNAM.png > $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png
+ln -s ../icons/hicolor/32x32/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS BUGS COPYING INSTALL NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS BUGS COPYING NEWS README sample.wmixrc $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/desktop/wmix/wmix.info b/desktop/wmix/wmix.info
index 86a50be23c0d..7d777a6c976d 100644
--- a/desktop/wmix/wmix.info
+++ b/desktop/wmix/wmix.info
@@ -1,10 +1,10 @@
 PRGNAM="wmix"
-VERSION="3.4"
+VERSION="3.5"
 HOMEPAGE="https://www.dockapps.net/wmix"
-DOWNLOAD="https://www.dockapps.net/download/wmix-3.4.tar.gz"
-MD5SUM="79bda572e83c9ebdfd4de71b77d2dc6f"
+DOWNLOAD="https://www.dockapps.net/download/wmix-3.5.tar.gz"
+MD5SUM="643e9aa78dbd0b7df4a03b06de69cdde"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Michael Heras"
-EMAIL="userxbw@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/desktop/wmix/wmix.png b/desktop/wmix/wmix.png
new file mode 100644
index 000000000000..ef2634802ab7
--- /dev/null
+++ b/desktop/wmix/wmix.png