1 files changed, 22 insertions, 28 deletions
diff --git a/audio/jalv/jalv.SlackBuild b/audio/jalv/jalv.SlackBuild
index 62f708bf782e7..02d5e74fbdb4a 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