audio/jalv: Updated for version 1.6.6.

Signed-off-by: B. Watson <yalhcru@gmail.com>

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

6 files changed, 142 insertions, 159 deletions

diff --git a/audio/jalv/README b/audio/jalv/README
index 8e5aebef8d..9d43754b99 100644
--- a/audio/jalv/README
+++ b/audio/jalv/README
@@ -11,12 +11,14 @@ valgrind, and is capable of dumping all plugin to/from UI communication
 in a human readable format.
 
 For testing with various host toolkits, there are several Jalv
-executables: jalv, jalv.gtk, jalv.gtkmm, and jalv.qt. The jalv and
-jalv.gtk programs are suitable for production use by users, the others
-are less complete and intended for developer testing only. By default,
-this SlackBuild only builds jalv (text) and jalv.gtk (gtk+-2.0). If you
-really want to build the other UIs, pass ALL_UIS=yes in the script's
-environment.
+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
 elevated privileges (required for realtime audio processing). This
diff --git a/audio/jalv/jalv.SlackBuild b/audio/jalv/jalv.SlackBuild
index d66f934bba..5bf4d59152 100644
--- a/audio/jalv/jalv.SlackBuild
+++ b/audio/jalv/jalv.SlackBuild
@@ -6,10 +6,15 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211202 bkw:
+# - update for v1.6.6.
+# - fix man pages.
+# - add source tarball for waflib (no longer included in jalv src).
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=jalv
-VERSION=${VERSION:-1.4.6}
+VERSION=${VERSION:-1.6.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +27,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -50,39 +52,50 @@ 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.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+tar xvf $CWD/waflib-$WAFLIBVER.tar.xz
 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 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# only the textmode and gtk+2 UIs are considered stable by upstream,
-# no point building the others
-if [ "${ALL_UIS:-no}" = "no" ]; then
-  patch -p1 < $CWD/remove_experimental_uis.diff
-fi
+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
 
-strip $PKG/usr/bin/*
+# 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
 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
+cp -a AUTHORS* COPYING* NEWS* README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/jalv/jalv.info b/audio/jalv/jalv.info
index 37f7c22fc9..ec0c0a759b 100644
--- a/audio/jalv/jalv.info
+++ b/audio/jalv/jalv.info
@@ -1,8 +1,10 @@
 PRGNAM="jalv"
-VERSION="1.4.6"
-HOMEPAGE="http://drobilla.net/software/jalv/"
-DOWNLOAD="http://download.drobilla.net/jalv-1.4.6.tar.bz2"
-MD5SUM="8c11c58c4b0e69fb6b21041bcac275f7"
+VERSION="1.6.6"
+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_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack lilv suil"
diff --git a/audio/jalv/manpages.diff b/audio/jalv/manpages.diff
new file mode 100644
index 0000000000..d0836f5703
--- /dev/null
+++ b/audio/jalv/manpages.diff
@@ -0,0 +1,96 @@
+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)
+ 
diff --git a/audio/jalv/remove_experimental_uis.diff b/audio/jalv/remove_experimental_uis.diff
deleted file mode 100644
index 78fb2f6693..0000000000
--- a/audio/jalv/remove_experimental_uis.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -Naur jalv-1.4.6/doc/jalv.gtkmm.1 jalv-1.4.6.patched/doc/jalv.gtkmm.1
---- jalv-1.4.6/doc/jalv.gtkmm.1	2012-04-19 18:12:54.000000000 -0400
-+++ jalv-1.4.6.patched/doc/jalv.gtkmm.1	1969-12-31 19:00:00.000000000 -0500
-@@ -1,25 +0,0 @@
--.TH JALV.GTKMM 1 "19 Apr 2012"
--
--.SH NAME
--.B jalv.gtkmm \- Run an LV2 plugin as a JACK application (Gtkmm version).
--
--.SH SYNOPSIS
--.B jalv.gtkmm PLUGIN_URI
--
--.SH DESCRIPTION
--
--This is a versionm of Jalv with a GUI implemented in Gtkmm.  It is mainly for
--developer testing purposes, for a production ready program use jalv.gtk.
--
--.SH SEE ALSO
--.BR jalv(1),
--.BR jalv.gtk(1),
--.BR jalv.qt(2),
--.BR lv2ls(1),
--.BR jackd(1)
--
--.SH AUTHOR
--jalv was written by David Robillard <d@drobilla.net>
--.PP
--This manual page was written by Jaromír Mikes <mira.mikes@seznam.cz>
--and David Robillard <d@drobilla.net>
-diff -Naur jalv-1.4.6/doc/jalv.qt.1 jalv-1.4.6.patched/doc/jalv.qt.1
---- jalv-1.4.6/doc/jalv.qt.1	2012-04-19 18:12:43.000000000 -0400
-+++ jalv-1.4.6.patched/doc/jalv.qt.1	1969-12-31 19:00:00.000000000 -0500
-@@ -1,25 +0,0 @@
--.TH JALV.QT 1 "19 Apr 2012"
--
--.SH NAME
--.B jalv.qt \- Run an LV2 plugin as a JACK application (Qt version).
--
--.SH SYNOPSIS
--.B jalv.qt PLUGIN_URI
--
--.SH DESCRIPTION
--
--This is a versionm of Jalv with a GUI implemented in Qt.  It is mainly for
--developer testing purposes, for a production ready program use jalv.gtk.
--
--.SH SEE ALSO
--.BR jalv(1),
--.BR jalv.gtkmm(1),
--.BR jalv.qt(2),
--.BR lv2ls(1),
--.BR jackd(1)
--
--.SH AUTHOR
--jalv was written by David Robillard <d@drobilla.net>
--.PP
--This manual page was written by Jaromír Mikes <mira.mikes@seznam.cz>
--and David Robillard <d@drobilla.net>
-diff -Naur jalv-1.4.6/wscript jalv-1.4.6.patched/wscript
---- jalv-1.4.6/wscript	2014-08-08 17:36:24.000000000 -0400
-+++ jalv-1.4.6.patched/wscript	2016-10-16 13:55:52.873636638 -0400
-@@ -48,15 +48,6 @@
-                       atleast_version='0.120.0', mandatory=True)
-     autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK2',
-                       atleast_version='2.18.0', mandatory=False)
--    autowaf.check_pkg(conf, 'gtk+-3.0', uselib_store='GTK3',
--                      atleast_version='3.0.0', mandatory=False)
--    autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM2',
--                      atleast_version='2.20.0', mandatory=False)
--    if not Options.options.no_qt:
--        autowaf.check_pkg(conf, 'QtGui', uselib_store='QT4',
--                          atleast_version='4.0.0', mandatory=False)
--        if conf.is_defined('HAVE_QT4'):
--            conf.find_program('moc')
- 
-     conf.check(function_name='jack_port_type_get_buffer_size',
-                header_name='jack/jack.h',
-@@ -81,12 +72,6 @@
-                         conf.is_defined('HAVE_JACK_METADATA'))
-     autowaf.display_msg(conf, "Gtk 2.0 support",
-                         conf.is_defined('HAVE_GTK2'))
--    autowaf.display_msg(conf, "Gtk 3.0 support",
--                        conf.is_defined('HAVE_GTK3'))
--    autowaf.display_msg(conf, "Gtkmm 2.0 support",
--                        conf.is_defined('HAVE_GTKMM2'))
--    autowaf.display_msg(conf, "Qt 4.0 support",
--                        conf.is_defined('HAVE_QT4'))
-     print('')
- 
- def build(bld):
-@@ -113,39 +98,6 @@
-                   install_path = '${BINDIR}')
-         autowaf.use_lib(bld, obj, libs + ' GTK2')
- 
--    # Gtk3 version
--    if bld.is_defined('HAVE_GTK3'):
--        obj = bld(features     = 'c cprogram',
--                  source       = source + ' src/jalv_gtk.c',
--                  target       = 'jalv.gtk3',
--                  includes     = ['.', 'src'],
--                  lib          = ['pthread', 'm'],
--                  install_path = '${BINDIR}')
--        autowaf.use_lib(bld, obj, libs + ' GTK3')
--
--    # Gtkmm version
--    if bld.is_defined('HAVE_GTKMM2'):
--        obj = bld(features     = 'c cxx cxxprogram',
--                  source       = source + ' src/jalv_gtkmm2.cpp',
--                  target       = 'jalv.gtkmm',
--                  includes     = ['.', 'src'],
--                  lib          = ['pthread'],
--                  install_path = '${BINDIR}')
--        autowaf.use_lib(bld, obj, libs + ' GTKMM2')
--
--    # Qt version
--    if bld.is_defined('HAVE_QT4'):
--        obj = bld(rule = '${MOC} ${SRC} > ${TGT}',
--                  source = 'src/jalv_qt4.cpp',
--                  target = 'jalv_qt4_meta.hpp')
--        obj = bld(features     = 'c cxx cxxprogram',
--                  source       = source + ' src/jalv_qt4.cpp',
--                  target       = 'jalv.qt',
--                  includes     = ['.', 'src'],
--                  lib          = ['pthread'],
--                  install_path = '${BINDIR}')
--        autowaf.use_lib(bld, obj, libs + ' QT4')
--
-     # Man pages
-     bld.install_files('${MANDIR}/man1', bld.path.ant_glob('doc/*.1'))
- 
diff --git a/audio/jalv/setcap.sh b/audio/jalv/setcap.sh
index f9f44f5621..20afc3bb7c 100644
--- a/audio/jalv/setcap.sh
+++ b/audio/jalv/setcap.sh
@@ -1,5 +1,5 @@
 if [ -x /sbin/setcap ]; then
-  for BIN in jalv jalv.gtk jalv.gtk3 jalv.gtkmm jalv.qt; do
+  for BIN in jalv jalv.gtk jalv.gtk3 jalv.gtkmm jalv.qt jalv.qt5; do
     [ -e usr/bin/$BIN ] && /sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/$BIN
   done
 fi