audio/jalv: Updated for version 1.6.8.

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

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

5 files changed, 28 insertions, 131 deletions

diff --git a/audio/jalv/README b/audio/jalv/README
index 9d43754b99..6b7cadd4ad 100644
--- a/audio/jalv/README
+++ b/audio/jalv/README
@@ -16,8 +16,6 @@ executables:
 jalv        - textmode shell-like UI
 jalv.gtk    - GTK+2
 jalv.gtk3   - GTK+3
-jalv.gtkmm  - GTKMM with GTK+2
-jalv.qt     - Qt4 (optional; only built if qt4 is installed)
 jalv.qt5    - Qt5
 
 This package uses POSIX filesystem capabilities to execute with
diff --git a/audio/jalv/doinst.sh b/audio/jalv/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/audio/jalv/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/audio/jalv/jalv.SlackBuild b/audio/jalv/jalv.SlackBuild
index 62f708bf78..02d5e74fbd 100644
--- a/audio/jalv/jalv.SlackBuild
+++ b/audio/jalv/jalv.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230110 bkw: update for v1.6.8. no more waf; it uses meson now.
 # 20211202 bkw:
 # - update for v1.6.6.
 # - fix man pages.
@@ -14,7 +15,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=jalv
-VERSION=${VERSION:-1.6.6}
+VERSION=${VERSION:-1.6.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -52,48 +53,38 @@ fi
 
 set -e
 
-# waflib got broken out into its own submodule, which isn't included
-# in github's generated tarball. my waflib tarball was made by
-# $ git clone https://github.com/drobilla/jalv/
-# $ cd jalv
-# $ git submodule update --init
-# $ tar cvfJ ../waflib-b600c92.tar.xz waflib/
-# (the commit hash came from 'cd waflib; git log')
-WAFLIBVER=${WAFLIBVER:-b600c92}
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-tar xvf $CWD/waflib-$WAFLIBVER.tar.xz
 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 {} \+
 
-# Fix references to 'jalv.qt(2)', mention jalv.gtk3 and jalv.qt5 in
-# jalv.gtk.1 and jalv.qt.1.
-patch -p1 < $CWD/manpages.diff
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-  ./waf configure \
-  --libdir=/usr/lib$LIBDIRSUFFIX \
-  --prefix=/usr \
-  --mandir=/usr/man
-
-./waf build
-./waf install --destdir=$PKG
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  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 ..
 
 # the one in /usr/lib*/jack/ seems to be a jack plugin. not documented,
 # but jack won't load it by default so leaving it there is OK.
-strip $PKG/usr/bin/* $PKG/usr/lib*/jack/*.so
+#strip $PKG/usr/bin/* $PKG/usr/lib*/jack/*.so
 gzip -9 $PKG/usr/man/man1/*.1
 
-ln -s $PRGNAM.qt.1.gz $PKG/usr/man/man1/$PRGNAM.qt5.1.gz
-ln -s $PRGNAM.gtk.1.gz $PKG/usr/man/man1/$PRGNAM.gtk3.1.gz
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS* COPYING* NEWS* README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -101,6 +92,9 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
+# there's a .desktop file but no icon. *shrug*.
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
 # Only add capability stuff if not disabled:
 if [ "${SETCAP:-yes}" = "yes" ]; then
   cat $CWD/setcap.sh >> $PKG/install/doinst.sh
diff --git a/audio/jalv/jalv.info b/audio/jalv/jalv.info
index af65d248c6..e4ee26bd11 100644
--- a/audio/jalv/jalv.info
+++ b/audio/jalv/jalv.info
@@ -1,10 +1,8 @@
 PRGNAM="jalv"
-VERSION="1.6.6"
+VERSION="1.6.8"
 HOMEPAGE="https://github.com/drobilla/jalv/"
-DOWNLOAD="https://github.com/drobilla/jalv/archive/v1.6.6/jalv-1.6.6.tar.gz \
-          https://slackware.uk/~urchlay/src/waflib-b600c92.tar.xz"
-MD5SUM="2640270b1e4458a0ab08fe317ada7ce8 \
-        15c3af49e31adb5af97ba12a9f2f4012"
+DOWNLOAD="https://github.com/drobilla/jalv/archive/v1.6.8/jalv-1.6.8.tar.gz"
+MD5SUM="6de53c0c11e1ebf934554aaefc5c5e81"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack lilv suil"
diff --git a/audio/jalv/manpages.diff b/audio/jalv/manpages.diff
deleted file mode 100644
index d0836f5703..0000000000
--- a/audio/jalv/manpages.diff
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -Naur jalv-1.6.6/doc/jalv.1 jalv-1.6.6.patched/doc/jalv.1
---- jalv-1.6.6/doc/jalv.1	2021-01-07 17:06:53.000000000 -0500
-+++ jalv-1.6.6.patched/doc/jalv.1	2021-12-02 14:57:59.549632884 -0500
-@@ -1,4 +1,4 @@
--.TH JALV 1 "18 Feb 2017"
-+.TH JALV 1 "2 Dec 2021" jalv-1.6.6
- 
- .SH NAME
- .B jalv \- Run an LV2 plugin as a JACK application (console version).
-@@ -73,8 +73,10 @@
- 
- .SH "SEE ALSO"
- .BR jalv.gtk(1),
-+.BR jalv.gtk3(1),
- .BR jalv.gtkmm(1),
--.BR jalv.qt(2),
-+.BR jalv.qt(1),
-+.BR jalv.qt5(1),
- .BR lv2ls(1),
- .BR jackd(1)
- 
-diff -Naur jalv-1.6.6/doc/jalv.gtk.1 jalv-1.6.6.patched/doc/jalv.gtk.1
---- jalv-1.6.6/doc/jalv.gtk.1	2021-01-07 17:06:53.000000000 -0500
-+++ jalv-1.6.6.patched/doc/jalv.gtk.1	2021-12-02 14:59:06.229628518 -0500
-@@ -1,10 +1,12 @@
--.TH JALV.GTK "18 Feb 2017"
-+.TH JALV.GTK 1 "2 Dec 2021" jalv-1.6.6
- 
- .SH NAME
- .B jalv.gtk \- Run an LV2 plugin as a JACK application (Gtk version).
- 
- .SH SYNOPSIS
- .B jalv.gtk [OPTION]... PLUGIN_URI
-+.PP
-+.B jalv.gtk3 [OPTION]... PLUGIN_URI
- 
- .SH OPTIONS
- 
-@@ -47,7 +49,8 @@
- .SH "SEE ALSO"
- .BR jalv(1),
- .BR jalv.gtkmm(1),
--.BR jalv.qt(2),
-+.BR jalv.qt(1),
-+.BR jalv.qt5(1),
- .BR lv2ls(1),
- .BR jackd(1)
- 
-diff -Naur jalv-1.6.6/doc/jalv.gtkmm.1 jalv-1.6.6.patched/doc/jalv.gtkmm.1
---- jalv-1.6.6/doc/jalv.gtkmm.1	2021-01-07 17:06:53.000000000 -0500
-+++ jalv-1.6.6.patched/doc/jalv.gtkmm.1	2021-12-02 14:58:47.324629756 -0500
-@@ -1,4 +1,4 @@
--.TH JALV.GTKMM 1 "19 Apr 2012"
-+.TH JALV.GTKMM 1 "2 Dec 2021" jalv-1.6.6
- 
- .SH NAME
- .B jalv.gtkmm \- Run an LV2 plugin as a JACK application (Gtkmm version).
-@@ -14,7 +14,9 @@
- .SH "SEE ALSO"
- .BR jalv(1),
- .BR jalv.gtk(1),
--.BR jalv.qt(2),
-+.BR jalv.gtk3(1),
-+.BR jalv.qt(1),
-+.BR jalv.qt5(1),
- .BR lv2ls(1),
- .BR jackd(1)
- 
-diff -Naur jalv-1.6.6/doc/jalv.qt.1 jalv-1.6.6.patched/doc/jalv.qt.1
---- jalv-1.6.6/doc/jalv.qt.1	2021-01-07 17:06:53.000000000 -0500
-+++ jalv-1.6.6.patched/doc/jalv.qt.1	2021-12-02 14:58:53.491629352 -0500
-@@ -1,10 +1,12 @@
--.TH JALV.QT 1 "19 Apr 2012"
-+.TH JALV.QT 1 "2 Dec 2021" jalv-1.6.6
- 
- .SH NAME
- .B jalv.qt \- Run an LV2 plugin as a JACK application (Qt version).
- 
- .SH SYNOPSIS
- .B jalv.qt PLUGIN_URI
-+.PP
-+.B jalv.qt5 PLUGIN_URI
- 
- .SH DESCRIPTION
- 
-@@ -13,8 +15,9 @@
- 
- .SH "SEE ALSO"
- .BR jalv(1),
-+.BR jalv.gtk(1),
-+.BR jalv.gtk3(1),
- .BR jalv.gtkmm(1),
--.BR jalv.qt(2),
- .BR lv2ls(1),
- .BR jackd(1)
-