4 files changed, 60 insertions, 33 deletions
diff --git a/audio/samplv1/README b/audio/samplv1/README
index a91b61e3ec..e4f3324dd6 100644
--- a/audio/samplv1/README
+++ b/audio/samplv1/README
@@ -4,8 +4,10 @@ samplv1 is an old-school all-digital polyphonic sampler synthesizer
 with stereo fx. It runs either as a standalone JACK application or an
 LV2 instrument plugin.
 
-Optional dependency: The LV2 instrument plugin requires lv2 to be
-installed (auto-detected at compile time).
+Optional dependencies (autodetected):
+
+lv2 - required to build samplv1's LV2 instrument plugins.
+liblo - required for OSC (Open Sound Control) support.
 
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing). This
diff --git a/audio/samplv1/samplv1.SlackBuild b/audio/samplv1/samplv1.SlackBuild
index 9037be6d45..cf7ccb6896 100644
--- a/audio/samplv1/samplv1.SlackBuild
+++ b/audio/samplv1/samplv1.SlackBuild
@@ -1,11 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for samplv1
 
-# 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.
 
+# 20230629 bkw: update for 0.9.31
+# 20230109 bkw: update for 0.9.28
+# 20211205 bkw: update for 0.9.23
+# 20201106 bkw: update for 0.9.18
+# 20200114 bkw: update for 0.9.12
+# 20191210 bkw: update for 0.9.11, document optional liblo dep, have slack-desc
+#               tell user whether or not optional deps are included.
 # 20181216 bkw: update for 0.9.4, which now requires qt5 :(
 # 20180615 bkw: update for 0.9.2
 # 20180702 bkw: update for 0.9.1, install French man page correctly.
@@ -15,10 +22,13 @@
 # 20170627 bkw: update for 0.8.3
 # 20170614 bkw: update for 0.8.2, drop qt5 dep, build with qt4
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=samplv1
-VERSION=${VERSION:-0.9.4}
+VERSION=${VERSION:-0.9.31}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -28,7 +38,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}
@@ -59,20 +73,21 @@ 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 {} \+
 
-LDFLAGS="-Wl,-s" \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+export PATH=/usr/lib$LIBDIRSUFFIX/qt5/bin:$PATH
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make VERBOSE=1
+  make install/strip DESTDIR=$PKG 
+cd ..
+  
+gzip -9 $PKG/usr/man/man1/* $PKG/usr/man/fr/man1/*
 
 # 20180702 bkw: See comments in synthv1.SlackBuild to understand this.
 
@@ -81,8 +96,8 @@ make install DESTDIR=$PKG
 [ -d $PKG/usr/share/metainfo ] && \
   mv $PKG/usr/share/metainfo $PKG/usr/share/appdata
 
-mkdir -p $PKG/usr/man/fr/man1 $PKG/usr/man/fr.UTF-8/man1
-mv $PKG/usr/man/man1/$PRGNAM.fr.1.gz $PKG/usr/man/fr.UTF-8/man1/$PRGNAM.1.gz
+mkdir -p $PKG/usr/man/fr.UTF-8/man1
+mv $PKG/usr/man/fr/man1/$PRGNAM.1.gz $PKG/usr/man/fr.UTF-8/man1/$PRGNAM.1.gz
 zcat $PKG/usr/man/fr.UTF-8/man1/$PRGNAM.1.gz | \
   iconv -f UTF-8 -t ISO-8859-1 | \
   gzip -9c \
@@ -95,11 +110,21 @@ for i in man1 fr/man1 fr.UTF-8/man1; do
 done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog README LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+LIBLO=no
+LV2=no
+ldd $PKG/usr/bin/${PRGNAM}_jack | grep -q liblo && LIBLO=yes
+if [ -e $PKG/usr/lib$LIBDIRSUFFIX/lv2/$PRGNAM.lv2 ]; then
+  LV2=yes
+  # 20230629 bkw: just a nitpick, but shared libs are supposed to be +x:
+  chmod +x $PKG/usr/lib$LIBDIRSUFFIX/lv2/$PRGNAM.lv2/*.so
+fi
+
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed -e "s,@LIBLO@,$LIBLO," -e "s,@LV2@,$LV2," $CWD/slack-desc \
+  > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 if [ "${SETCAP:-yes}" = "yes" ]; then
@@ -109,4 +134,4 @@ if [ "${SETCAP:-yes}" = "yes" ]; then
 fi
 
 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/samplv1/samplv1.info b/audio/samplv1/samplv1.info
index 4474df7182..1ab99db59b 100644
--- a/audio/samplv1/samplv1.info
+++ b/audio/samplv1/samplv1.info
@@ -1,10 +1,10 @@
 PRGNAM="samplv1"
-VERSION="0.9.4"
+VERSION="0.9.31"
 HOMEPAGE="https://samplv1.sourceforge.io/"
-DOWNLOAD="https://downloads.sourceforge.net/project/samplv1/samplv1/0.9.4/samplv1-0.9.4.tar.gz"
-MD5SUM="7976e61b9db5fd7acd4a777b81faec1b"
+DOWNLOAD="https://downloads.sourceforge.net/project/samplv1/samplv1/0.9.31/samplv1-0.9.31.tar.gz"
+MD5SUM="2df4770029ebdafe734555591812d563"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jack-audio-connection-kit qt5"
+REQUIRES="jack"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/audio/samplv1/slack-desc b/audio/samplv1/slack-desc
index 38b36b565a..e080ff12ba 100644
--- a/audio/samplv1/slack-desc
+++ b/audio/samplv1/slack-desc
@@ -12,8 +12,8 @@ samplv1: samplv1 is an old-school all-digital polyphonic sampler synthesizer
 samplv1: with stereo fx. It runs either as a standalone JACK application or an
 samplv1: LV2 instrument plugin.
 samplv1:
+samplv1: Build options:
 samplv1:
-samplv1:
-samplv1:
-samplv1:
+samplv1: liblo (OSC support): @LIBLO@
+samplv1: lv2 instrument support: @LV2@
 samplv1: