audio/jack1: Updated for version 0.126.0.

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

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

3 files changed, 52 insertions, 15 deletions

diff --git a/audio/jack1/jack1.SlackBuild b/audio/jack1/jack1.SlackBuild
index 089c020d2f..2d908b69af 100644
--- a/audio/jack1/jack1.SlackBuild
+++ b/audio/jack1/jack1.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Slackware build script for jack1-legacy, adapted from
+# Slackware build script for jack1, adapted from
 # jack-audio-connection-kit.SlackBuild.
 
 # Copyright 2007-2014 Heinz Wiesinger, Amsterdam, The Netherlands
@@ -32,15 +32,20 @@
 # If you need to see the commit log for the old name, use a command like:
 # git log -- audio/jack-audio-connection-kit
 
+# 20240319 bkw: updated for v0.126.0. since upstream moved the tools
+# to a separate git repo, modified this build to include that as well,
+# for compatibility with older releases.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=jack1
-VERSION=${VERSION:-0.125.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.126.0}
+TOOLSVER=${TOOLSVER:-4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-SRCNAM=jack-audio-connection-kit
+SRCNAM=$PRGNAM
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -81,9 +86,11 @@ cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
+TOPDIR="$(pwd)"
+tar xvf $CWD/jack-example-tools-$TOOLSVER.tar.gz
 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 {} +
 
 # respect march and mtune flags: fixes building on x86_64
 sed -i 's|-march=native \-mtune=native||' configure.ac
@@ -106,11 +113,39 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
+# 20240319 bkw: now build the tools against the installed libs in $PKG.
+cd $TOPDIR
+sed "s,/usr,$PKG/usr,g" $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/jack.pc > jack.pc
+export PKG_CONFIG_PATH=$TOPDIR:$PKG_CONFIG_PATH
+cd jack-example-tools-$TOOLSVER
+mkdir build
+MFLAGS="$SLKCFLAGS -I$PKG/usr/include"
+cd build
+  CFLAGS="$MFLAGS" \
+  CXXFLAGS="$MFLAGS" \
+  LDFLAGS="-L$PKG/usr/lib$LIBDIRSUFFIX" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
 gzip -9 $PKG/usr/man/man?/*.?
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* README TODO $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+PKGDOC2=$PKGDOC/jack-example-tools-$TOOLSVER
+mkdir -p $PKGDOC $PKGDOC2
+cp -a LICENSE *.md $PKGDOC2
+cd $TOPDIR
+cp -a AUTHORS COPYING* README.md TODO $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 rm -f $PKG/usr/lib*/*.la
 
diff --git a/audio/jack1/jack1.info b/audio/jack1/jack1.info
index 847c54323d..e6ca2bb764 100644
--- a/audio/jack1/jack1.info
+++ b/audio/jack1/jack1.info
@@ -1,8 +1,10 @@
 PRGNAM="jack1"
-VERSION="0.125.0"
+VERSION="0.126.0"
 HOMEPAGE="http://jackaudio.org"
-DOWNLOAD="http://mirror.sobukus.de/files/grimoire/audio-drivers/jack-audio-connection-kit-0.125.0.tar.gz"
-MD5SUM="d9b7e230aeae2d5b45c7a822b2d2dd15"
+DOWNLOAD="https://github.com/jackaudio/jack1/releases/download/0.126.0/jack1-0.126.0.tar.gz \
+          https://github.com/jackaudio/jack-example-tools/archive/4/jack-example-tools-4.tar.gz"
+MD5SUM="d9b7e230aeae2d5b45c7a822b2d2dd15 \
+        5913c06644855f472894da53a624e63f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/jack1/setcap.sh b/audio/jack1/setcap.sh
index 7286a60f22..f66a272eec 100644
--- a/audio/jack1/setcap.sh
+++ b/audio/jack1/setcap.sh
@@ -1,12 +1,12 @@
 # set realtime capabilities on all these binaries
 if [ -x /sbin/setcap ]; then
   for i in alsa_in alsa_out jack_alias jack_bufsize jack_connect \
-           jack_disconnect jack_evmon jack_freewheel jack_impulse_grabber \
+           jack_evmon jack_freewheel jack_impulse_grabber \
            jack_iodelay jack_latent_client jack_load jack_load_test \
            jack_lsp jack_metro jack_midi_dump jack_midiseq jack_midisine \
            jack_monitor_client jack_netsource jack_property jack_rec \
-           jack_samplerate jack_server_control jack_session_notify \
-           jack_showtime jack_simple_client jack_simple_session_client \
+           jack_samplerate jack_server_control \
+           jack_showtime jack_simple_client \
            jack_transport jack_transport_client jack_unload jack_wait jackd
   do
     /sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/$i