4 files changed, 44 insertions, 28 deletions
diff --git a/audio/alsa-tools/README b/audio/alsa-tools/README
index a08fa787cd..f6c2e8976f 100644
--- a/audio/alsa-tools/README
+++ b/audio/alsa-tools/README
@@ -4,14 +4,15 @@ including firmware loaders for pcmcia and USB devices.
 This package includes the firmware as well as the loaders (so there's
 no need for a separate alsa-firmware package like Debian has).
 
-This build includes udev rules for the Tascam US-122, US-224, and US-428
-USB audio interfaces (which replace the old hotplug scripts shipped
-with the alsa-tools source). Also included is the SlackBuild author's
-"tascam-us122-HOWTO" document (see /usr/doc/alsa-tools-$VERSION).
+This build includes udev rules for the Tascam US-122, US-224,
+and US-428 USB audio interfaces (which replace the old hotplug
+scripts shipped with the alsa-tools source). Also included
+is the SlackBuild author's "tascam-us122-HOWTO" document (see
+/usr/doc/alsa-tools-$VERSION).
 
 Included tools:
 
-  as10k1 - assembler for emu10k1 DSP chip present in Creative soundcards
+  as10k1 - assembler for emu10k1 DSP chip found in Creative soundcards
   cspctl - Sound Blaster 16 ASP/CSP control program
   dl10k1 - loads dumps previously created with lo10k1 & ld10k1
 * echomixer - Linux equivalent of the Echoaudio console application
@@ -27,26 +28,27 @@ Included tools:
   ld10k1d - daemon for lo10k1
   lo10k1 - EMU10K1 (EMU10K2) patch loader for ALSA
   mixartloader - Firmware loader for Digigram miXart soundcards
-  pcxhrloader - Firmware loader for Digigram pcxhr compatible soundcards
+  pcxhrloader - Firmware loader for Digigram pcxhr compatible cards
 * qlo10k1 - GUI for loading patches on EMU10K1/EMU10K2 cards
-* rmedigicontrol - control tool for RME Digi32 and RME Digi96 soundcards
+* rmedigicontrol - control tool for RME Digi32 and RME Digi96 cards
   sbiload - OPL2/3 FM instrument loader for ALSA hwdep
   sscape_ctl - ALSA SoundScape control utility
   us428control - Tascam US-428 control surface daemon
-  usx2yloader - 2nd Phase Firmware loader for Tascam USX2Y USB soundcards
+  usx2yloader - 2nd Phase Firmware loader for Tascam USX2Y USB cards
   vxloader - Firmware loader for Digigram VX soundcards
 
 (Older versions included the tools "ac3dec" and "extract_ac3", which
 were removed from 1.0.27, probably for legal reasons)
 
-Tools marked with an * are GUI tools that require X. To build on an X-less
-system, set GUI=no in the environment.
+Tools marked with an * are GUI tools that require X. To build on an
+X-less system, set GUI=no in the environment.
 
 Optional dependencies:
 
 qt3 - only used for qlo10k1 tool (used for loading patches into emu10k1
       cards with a hardware MIDI synth). This tool won't be built, if
-      qt3 is not installed (or QT3=no or GUI=no is set in the environment).
+      qt3 is not installed (or QT3=no or GUI=no is set in the
+      environment).
 
 fltk - only used for the hdspconf and hdspmixer tools (only useful for
        Hammerfall HDSP cards). This tool won't be built, if fltk is not
diff --git a/audio/alsa-tools/alsa-tools.SlackBuild b/audio/alsa-tools/alsa-tools.SlackBuild
index 1ddd494037..8cf85cecd2 100644
--- a/audio/alsa-tools/alsa-tools.SlackBuild
+++ b/audio/alsa-tools/alsa-tools.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for alsa-tools
 
-# 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.
 
@@ -13,6 +13,9 @@
 # the firmware is being included in the package as well.
 # *** I agree.  --rworkman   :-)
 
+# 20230706 bkw: fix build (heisenbug)
+# 20220402 bkw: BUILD=2, remove broken symlinks, empty /etc dir
+# 20210804 bkw: update for 1.2.5 (firmware 1.2.4)
 # 20200224 bkw: update for 1.2.2 (firmware 1.2.1)
 # 20181204 bkw: update for 1.1.7
 # 20180614 bkw: update for 1.1.6
@@ -36,12 +39,12 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=alsa-tools
-VERSION=${VERSION:-1.2.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.2.5}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-FIRMVER=${FIRMVER:-1.2.1}
+FIRMVER=${FIRMVER:-1.2.4}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -51,9 +54,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
@@ -129,15 +129,20 @@ fi
 # hdspconf and hdspmixer depend on fltk. Don't build them if disabled or
 # not installed.
 if [ -e /usr/bin/fltk-config -a "${FLTK:-yes}" = "yes" ]; then
-  # 20200224 bkw: brokenness in 1.2.2.
-  sed -i 's,__u\(32\|64\),uint\1_t,g' hdspmixer/src/HDSPMixerWindow.cxx
+  # 20200224 bkw: brokenness in 1.2.2, fixed in 1.2.5.
+  if [ "$VERSION" = "1.2.2" ]; then
+    sed -i 's,__u\(32\|64\),uint\1_t,g' hdspmixer/src/HDSPMixerWindow.cxx
+  fi
 else
   rm -rf hdspconf hdspmixer
 fi
 
 # one loop to build them all. The -include stddef.h fixes qlo10k1 'ptrdiff_t doesn't
 # name a type' errors, and doesn't hurt anything else.
-for subdir in $( find . -name configure | sed -e 's,^\./,,' -e 's,/configure,,' ); do
+# 20230706 bkw: add '| sort', so we don't depend on the order 'find' lists
+# things. specifically, lo10k1 must come before qlo10k1.
+for subdir in $( find . -name configure | sed -e 's,^\./,,' -e 's,/configure,,' | sort ); do
+  echo "===> $subdir"
   cd $subdir
 
   LDFLAGS="-L/usr/lib$LIBDIRSUFFIX" \
@@ -221,6 +226,15 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 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
 
+rm -f $PKG/usr/lib*/*.la
+
+# 20220402 bkw: the firmware tarball doesn't include this firmware,
+# but 'make install' creates *broken* symlinks to it.
+rm -rf $PKG/lib/firmware/turtlebeach/
+
+# 20220402 bkw: /etc is included in the package for no apparent reason.
+rmdir $PKG/etc
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/audio/alsa-tools/alsa-tools.info b/audio/alsa-tools/alsa-tools.info
index 15b487253c..7b0ef29fde 100644
--- a/audio/alsa-tools/alsa-tools.info
+++ b/audio/alsa-tools/alsa-tools.info
@@ -1,12 +1,12 @@
 PRGNAM="alsa-tools"
-VERSION="1.2.2"
+VERSION="1.2.5"
 HOMEPAGE="http://www.alsa-project.org/"
-DOWNLOAD="ftp://ftp.alsa-project.org/pub/tools/alsa-tools-1.2.2.tar.bz2 \
-          ftp://ftp.alsa-project.org/pub/firmware/alsa-firmware-1.2.1.tar.bz2"
-MD5SUM="4e6187d2c3a8c73a9d75d66a72faed27 \
-        f8458efd25e6d6600dbc7aedf98f83a3"
+DOWNLOAD="http://www.alsa-project.org/files/pub/tools/alsa-tools-1.2.5.tar.bz2 \
+          http://www.alsa-project.org/files/pub/firmware/alsa-firmware-1.2.4.tar.bz2"
+MD5SUM="ce632a6c89ed47ee74ba415276a6a3cc \
+        ee6c1d24a1a4ac1d86992b408ed710a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/audio/alsa-tools/tascam-us122-HOWTO b/audio/alsa-tools/tascam-us122-HOWTO
index 7bf066d9fa..6bb5b15451 100644
--- a/audio/alsa-tools/tascam-us122-HOWTO
+++ b/audio/alsa-tools/tascam-us122-HOWTO
@@ -301,7 +301,7 @@ After creating the udev rules file, tell udevd to load it:
 Author
 ------
 
-B. Watson (yalhcru at gmail dot com)
+B. Watson (urchlay@slackware.uk)
 
 If you find anything confusing or inaccurate in this guide, or have more
 information (particularly about the other Tascam US-series interfaces),