1 files changed, 31 insertions, 18 deletions
diff --git a/audio/jalv/jalv.SlackBuild b/audio/jalv/jalv.SlackBuild
index d66f934bba3ef..5bf4d5915211b 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