3 files changed, 39 insertions, 22 deletions
diff --git a/audio/fluidsynth-dssi/README b/audio/fluidsynth-dssi/README
index 8d3e1268c1..24e3f3fdb9 100644
--- a/audio/fluidsynth-dssi/README
+++ b/audio/fluidsynth-dssi/README
@@ -1,2 +1,7 @@
-fluidsynth-dssi is a wrapper for the FluidSynth SoundFont-playing software
-synthesizer, allowing it to function as a DSSI plugin.
+fluidsynth-dssi (DSSI plugin wrapper for FluidSynth)
+
+fluidsynth-dssi is a wrapper for the FluidSynth SoundFont-playing
+software synthesizer, allowing it to function as a DSSI plugin.
+
+If you want fluidsynth-dssi to actually make sound, you'll have to
+install at least one soundfont (e.g. fluid-soundfont).
diff --git a/audio/fluidsynth-dssi/fluidsynth-dssi.SlackBuild b/audio/fluidsynth-dssi/fluidsynth-dssi.SlackBuild
index e21673dc6d..384fa08dce 100644
--- a/audio/fluidsynth-dssi/fluidsynth-dssi.SlackBuild
+++ b/audio/fluidsynth-dssi/fluidsynth-dssi.SlackBuild
@@ -1,15 +1,22 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fluidsynth-dssi
 
-# 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.
 
+# 20211205 bkw: BUILD=2
+# - remove .la file.
+# - add /usr/share/sounds/sf2 to default soundfont path.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fluidsynth-dssi
-VERSION=${VERSION:-1.0.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.0.0+20190112_c9b4107}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +26,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -44,14 +55,16 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.[gx]z
 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 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 {} \+
+
+sed -i '/#define *DEFAULT_SF2PATH/s,:/usr/share/sf2,&:/usr/share/sounds/sf2,' \
+       src/locate_soundfont.c
+
+[ -e configure ] || sh autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -66,15 +79,14 @@ CXXFLAGS="$SLKCFLAGS" \
 
 make
 make install-strip DESTDIR=$PKG
+rm -f $PKG/usr/lib*/dssi/*.la
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING ChangeLog README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/audio/fluidsynth-dssi/fluidsynth-dssi.info b/audio/fluidsynth-dssi/fluidsynth-dssi.info
index 99c39a25c1..504686c08b 100644
--- a/audio/fluidsynth-dssi/fluidsynth-dssi.info
+++ b/audio/fluidsynth-dssi/fluidsynth-dssi.info
@@ -1,10 +1,10 @@
 PRGNAM="fluidsynth-dssi"
-VERSION="1.0.0"
+VERSION="1.0.0+20190112_c9b4107"
 HOMEPAGE="http://dssi.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/dssi/fluidsynth-dssi-1.0.0.tar.gz"
-MD5SUM="6c9f660f0df4d2aad5076de75b2a0a67"
+DOWNLOAD="https://slackware.uk/~urchlay/src/fluidsynth-dssi-1.0.0+20190112_c9b4107.tar.xz"
+MD5SUM="fcc8d82ea6d7bae337aebdda9aded8c0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="dssi fluidsynth"
+REQUIRES="dssi"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"