audio/klick: Updated for version 0.14.2.

Signed-off-by: B. Watson <urchlay@slackware.uk>

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

5 files changed, 28 insertions, 26 deletions

diff --git a/audio/klick/Makefile b/audio/klick/Makefile
index 6a689c01705e..f23c95c19bf0 100644
--- a/audio/klick/Makefile
+++ b/audio/klick/Makefile
@@ -8,7 +8,7 @@
 # or install targets, and there's no dependency info for headers.
 
 PROJ=klick
-VERSION=0.12.2
+VERSION=0.14.2
 
 TERMINAL=yes
 OSC=no
@@ -17,7 +17,7 @@ SLKCFLAGS=
 PREFIX=/usr
 SHARE=$(PREFIX)/share/$(PROJ)
 
-SRCS=src/main.cc src/klick.cc src/options.cc src/audio_interface.cc src/audio_interface_jack.cc src/audio_interface_sndfile.cc src/audio_chunk.cc src/tempomap.cc src/metronome.cc src/metronome_simple.cc src/metronome_map.cc src/metronome_jack.cc src/position.cc src/util/util.cc
+SRCS=src/audio_chunk.cc src/audio_interface.cc src/audio_interface_jack.cc src/audio_interface_sndfile.cc src/klick.cc src/main.cc src/metronome.cc src/metronome_jack.cc src/metronome_map.cc src/metronome_simple.cc src/options.cc src/position.cc src/tempomap.cc
 
 LIBS:=$(shell pkg-config --libs jack samplerate sndfile)
 FLAGS:=$(shell pkg-config --cflags jack samplerate sndfile)
diff --git a/audio/klick/README b/audio/klick/README
index cff6659b7f61..11047acfb9a2 100644
--- a/audio/klick/README
+++ b/audio/klick/README
@@ -3,11 +3,6 @@ klick (metronome for jack)
 klick is an advanced command-line based metronome for JACK. It allows
 you to define complex tempo maps for entire songs or performances.
 
-Note: This package is built with liblo support. It allows klick to
-be controlled by other OSC-capable applications. You can disable with
-LIBLO=no in the script's environment. If you plan to use gtklick, it
-requires klick built with liblo support.
-
 Optional dependencies:
 
 rubberband - uses the RubberBand library for pitch adjustment, which
diff --git a/audio/klick/klick.SlackBuild b/audio/klick/klick.SlackBuild
index 41eaf42aef6d..d5e77827acb7 100644
--- a/audio/klick/klick.SlackBuild
+++ b/audio/klick/klick.SlackBuild
@@ -6,6 +6,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20240908 bkw:
+# - update for v0.14.2, new homepage (github).
+# - remove LIBLO=no since builds fail without it and it's already
+#   listed in REQUIRES.
+
 # 20211129 bkw: BUILD=2
 # - fix build on -current. see Makefile.
 # - autodetect rubberband and liblo.
@@ -19,8 +24,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=klick
-VERSION=${VERSION:-0.12.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.14.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -43,20 +48,23 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
 
+if ! pkg-config --exists liblo; then
+  cat <<EOF
+$0: builds without liblo no longer possible as of klick-0.14.2.
+EOF
+  exit 1
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -64,17 +72,17 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 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 {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 RUBBERBAND=${RUBBERBAND:-yes}
-LIBLO=${LIBLO:-yes}
 pkg-config --exists rubberband || RUBBERBAND="no"
-pkg-config --exists liblo || LIBLO="no"
 
 # 20211129 bkw: wrote a Makefile because the SConstruct is too old
 # for scons-4.0.1 and I hate scons anyway.
-make -f $CWD/Makefile RUBBERBAND=$RUBBERBAND OSC=$LIBLO SLKCFLAGS="$SLKCFLAGS"
+# 20240908 bkw: updated Makefile for 0.14.2. didn't even try scons, I
+# still hate it.
+make -f $CWD/Makefile RUBBERBAND=$RUBBERBAND OSC=yes SLKCFLAGS="$SLKCFLAGS"
 
 mkdir -p $PKG/usr/bin $PKG/usr/share/$PRGNAM/samples
 install -oroot -groot -s -m0755 $PRGNAM $PKG/usr/bin
@@ -89,13 +97,12 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING NEWS README doc/manual.html $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-L=no; R=no
+R=no
 objdump -p $PKG/usr/bin/$PRGNAM > otmp
-grep -q 'NEEDED.*liblo' otmp && L=yes
 grep -q 'NEEDED.*librubberband' otmp && R=yes
 
 mkdir -p $PKG/install
-sed -e "s,@L@,$L," -e "s,@R@,$R," $CWD/slack-desc > $PKG/install/slack-desc
+sed -e "s,@R@,$R," $CWD/slack-desc > $PKG/install/slack-desc
 
 # Only add capability stuff if not disabled:
 if [ "${SETCAP:-yes}" = "yes" ]; then
diff --git a/audio/klick/klick.info b/audio/klick/klick.info
index 7f97790a0f25..d86997900799 100644
--- a/audio/klick/klick.info
+++ b/audio/klick/klick.info
@@ -1,9 +1,9 @@
 PRGNAM="klick"
-VERSION="0.12.2"
-HOMEPAGE="http://das.nasophon.de/klick/"
-DOWNLOAD="http://das.nasophon.de/download/klick-0.12.2.tar.gz \
+VERSION="0.14.2"
+HOMEPAGE="https://github.com/Allfifthstuning/klick/"
+DOWNLOAD="https://github.com/Allfifthstuning/klick/archive/0.14.2/klick-0.14.2.tar.gz \
           http://das.nasophon.de/download/klick2ardour.py"
-MD5SUM="90bc69db650c6edaa08be47df0cfe424 \
+MD5SUM="c2256f1b51124ca6599754a9c7a6f4ea \
         affc28d8e97577b1cb6bb705d65c8c3a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/klick/slack-desc b/audio/klick/slack-desc
index 3392df06cc03..1803b1403c5f 100644
--- a/audio/klick/slack-desc
+++ b/audio/klick/slack-desc
@@ -11,7 +11,7 @@ klick:
 klick: klick is an advanced command-line based metronome for JACK. It allows
 klick: you to define complex tempo maps for entire songs or performances.
 klick:
-klick: Build options: rubberband=@R@, liblo=@L@
+klick: Build options: rubberband=@R@
 klick:
 klick:
 klick: