audio/zynaddsubfx: Updated for version 1.18.2.

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

4 files changed, 97 insertions, 39 deletions

diff --git a/audio/zynaddsubfx/README b/audio/zynaddsubfx/README
index 5cd9a002e1..c164c7f771 100644
--- a/audio/zynaddsubfx/README
+++ b/audio/zynaddsubfx/README
@@ -1,2 +1,17 @@
-ZynAddSubFX is a realtime software synthesizer with many features.
-Please see the docs for details.
+ZynAddSubFX is a fully featured open source software synthesizer
+capable of making a countless number of instruments, from some common
+heard from expensive hardware to interesting sounds that you'll boost
+to an amazing universe of sounds.
+
+Beside the standalone application, lv2 and vst plugins are provided.
+
+Optional dependencies, autodetected at buildtime:
+jack, dssi, portaudio, ntk, lash
+
+If ntk is detected at buildtime, fltk will not be used.
+
+If compiled against jack, this package uses POSIX filesystem
+capabilities to execute with elevated privileges (required for
+realtime audio processing). This may be considered a security/stability
+risk. Please read http://www.slackbuilds.org/caps/ for more information.
+To disable capabilities, pass SETCAP=no to the script.
diff --git a/audio/zynaddsubfx/slack-desc b/audio/zynaddsubfx/slack-desc
index 55b2f6a0d0..48948ea15d 100644
--- a/audio/zynaddsubfx/slack-desc
+++ b/audio/zynaddsubfx/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
            |-----handy-ruler------------------------------------------------------|
-zynaddsubfx: zynaddsubfx (realtime software synthesizer)
-zynaddsubfx:
-zynaddsubfx: ZynAddSubFX is a realtime software synthesizer for Linux and Windows
-zynaddsubfx: with many Features. Please see the docs for details.
-zynaddsubfx:
-zynaddsubfx: Homepage: http://zynaddsubfx.sourceforge.net
-zynaddsubfx:
+zynaddsubfx: zynaddsubfx (a software synthesizer)
 zynaddsubfx:
+zynaddsubfx: ZynAddSubFX is a fully featured open source software synthesizer
+zynaddsubfx: capable of making a countless number of instruments, from some common
+zynaddsubfx: heard from expensive hardware to interesting sounds that you'll boost
+zynaddsubfx: to an amazing universe of sounds.
 zynaddsubfx:
+zynaddsubfx: Beside the standalone application, lv2 and vst plugins are provided.
 zynaddsubfx:
+zynaddsubfx: Homepage: https://zynaddsubfx.sourceforge.io/
 zynaddsubfx:
diff --git a/audio/zynaddsubfx/zynaddsubfx.SlackBuild b/audio/zynaddsubfx/zynaddsubfx.SlackBuild
index 4f24d57fae..5e3211be01 100644
--- a/audio/zynaddsubfx/zynaddsubfx.SlackBuild
+++ b/audio/zynaddsubfx/zynaddsubfx.SlackBuild
@@ -2,18 +2,36 @@
 
 # Slackware build script for ZynAddSubFX
 
-# Written by Arik Miller ad423520 at hotmail dot com
-
+# Written by Arik Miller
 # Modified by SlackBuilds.org
+# Copyright 2020  Johannes Schoepfer, Germany
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zynaddsubfx
-VERSION=${VERSION:-2.5.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.0.5}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -24,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -44,7 +62,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -53,8 +71,15 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fixup for glibc-2.23 and/or gcc-5.3.0
-sed -i -e 's/isnan/std::isnan/' src/DSP/FFTwrapper.h
+# don't use bash completion
+sed -i \
+  -e '/add_subdirectory(bash-completion)/d' \
+  doc/CMakeLists.txt
+
+# doc needs asciidoctor, see workaround below
+sed -i \
+  -e '/add_subdirectory(doc)/d' \
+  CMakeLists.txt
 
 mkdir -p build
 cd build
@@ -62,39 +87,48 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DDefaultOutput=jack \
-    -DDefaultInput=jack \
-    -DGuiModule=fltk \
-    -DCMAKE_BUILD_TYPE=Release ..
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DPluginLibDir=/usr/lib$LIBDIRSUFFIX \
+    -DCMAKE_BUILD_TYPE=Release \
+    ..
   make
   make install DESTDIR=$PKG
 cd ..
 
-( cd ExternalPrograms/Spliter
+mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps/
+mv $PKG/usr/share/pixmaps/$PRGNAM.svg $PKG/usr/share/icons/hicolor/scalable/apps/
+mv $PRGNAM.ico $PKG/usr/share/pixmaps
+
+cd ExternalPrograms/Spliter
   make
   cp -a spliter $PKG/usr/bin
-)
+cd ../..
 
-( cd ExternalPrograms/Controller
+cd ExternalPrograms/Controller
   sed -i "s|Box\.h|Box\.H|" ControllerUI.fl
   make
   cp -a controller $PKG/usr/bin
-)
+cd ../..
+
+cd doc
+  a2x --doctype manpage --format manpage zynaddsubfx.1.txt
+  mkdir -p $PKG/usr/man/man1
+  cat zynaddsubfx.1 > $PKG/usr/man/man1/zynaddsubfx.1
+  asciidoc -a toc zynaddsubfx.txt
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd doc
-  make man xhtml
-)
-
-mkdir -p $PKG/usr/man/man1
-gzip -9 < doc/zynaddsubfx.1 > $PKG/usr/man/man1/zynaddsubfx.1.gz
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING ChangeLog *.txt doc/images doc/zynaddsubfx.html \
+  COPYING ChangeLog TODO* doc/images doc/zynaddsubfx.html \
   $PKG/usr/doc/$PRGNAM-$VERSION
+  mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
+  rm -rf $PKG/usr/share/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -102,4 +136,13 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
+if [ "${SETCAP:-yes}" = "yes" ]; then
+  for bin in $(find . -type f -exec file '{}' + | grep " ELF .* executable, " | cut -f 1 -d : ); do
+    if [ -n "$(readelf -d $bin | grep libjack.so)" ]; then
+      echo "/sbin/setcap cap_ipc_lock,cap_sys_nice=ep $bin" >> $PKG/install/doinst.sh
+      chown root:audio $PKG/$bin
+      chmod 0750 $PKG/$bin
+    fi
+  done
+fi
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/zynaddsubfx/zynaddsubfx.info b/audio/zynaddsubfx/zynaddsubfx.info
index 61d9389e84..07c5841795 100644
--- a/audio/zynaddsubfx/zynaddsubfx.info
+++ b/audio/zynaddsubfx/zynaddsubfx.info
@@ -1,10 +1,10 @@
 PRGNAM="zynaddsubfx"
-VERSION="2.5.2"
-HOMEPAGE="http://zynaddsubfx.sourceforge.net"
-DOWNLOAD="http://sourceforge.net/projects/zynaddsubfx/files/zynaddsubfx/2.5.2/zynaddsubfx-2.5.2.tar.gz"
-MD5SUM="c0d09b8e8d79691e79e7d424bc4f0263"
+VERSION="3.0.5"
+HOMEPAGE="https://zynaddsubfx.sourceforge.io/"
+DOWNLOAD="https://sourceforge.net/projects/zynaddsubfx/files/zynaddsubfx/3.0.5/zynaddsubfx-3.0.5.tar.bz2"
+MD5SUM="6a4b03064f64c228e2d6f4b5aef32244"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="liblo fltk lash mxml"
+REQUIRES="fltk liblo mxml"
 MAINTAINER="Johannes Schoepfer"
 EMAIL="slackbuilds@schoepfer.info"