7 files changed, 43 insertions, 46 deletions
diff --git a/audio/calf/README b/audio/calf/README
index da1d59cdb3..75707a3897 100644
--- a/audio/calf/README
+++ b/audio/calf/README
@@ -1,7 +1,9 @@
 Calf audio plugin pack for LADSPA, DSSI, LV2 and JACK. Contains effects
 (flanger, reverb, tape-like delay, phaser, rotary speaker, multi-mode
 filter, multi-tap chorus and compressor) and instruments (organ simulator
-and a monophonic synthesizer).
+and a monophonic synthesizer). This is falkTX's KXStudio fork of Calf,
+which re-adds LADSPA and DSSI support (which was removed from the
+original codebase).
 
 Optional dependencies: By default, these are auto-detected at build time.
 Support for each dep will be built if found, unless disabled with an
@@ -17,3 +19,9 @@ be built.
 
 To enable some experimental LV2 plugins designed for use with modular
 hosts, set EXPERIMENTAL=yes in the environment (default is "no").
+
+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/calf/calf.SlackBuild b/audio/calf/calf.SlackBuild
index 99474a3719..f7b62727fa 100644
--- a/audio/calf/calf.SlackBuild
+++ b/audio/calf/calf.SlackBuild
@@ -4,8 +4,17 @@
 
 # Written by B. Watson (yalhcru@gmail.com)
 
+# 20141030 bkw:
+# Finally getting around to submitting this, there have been no code
+# changes upstream since 20140308.
+
+# 20140308 bkw:
+# - Switched to falkTX's KXStudio fork of CALF. falkTX doesn't do release
+#   tarballs, so this is a git checkout from 20140308.
+# - Added capability stuff.
+
 PRGNAM=calf
-VERSION=${VERSION:-0.0.18.6}
+VERSION=${VERSION:-0.0.19kx}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
@@ -77,8 +86,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix for gcc-4.7.x
-patch -p1 < $CWD/gcc47.patch
+autoreconf -if
 
 # Note: The build ignores the provided -O2 in the flags (but the
 # -march/-mtune -fPIC stuff is used). If you really want to force
@@ -98,13 +106,16 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --htmldir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-shared \
+  --disable-static \
   $LADSPA_OPT \
   $DSSI_OPT \
   $LV2_OPT \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install DESTDIR=$PKG docdir=/usr/doc/$PRGNAM-$VERSION
 
 # install-strip is supported, but doesn't work:
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -113,9 +124,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING* ChangeLog README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* ChangeLog README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # This shouldn't be in the package:
@@ -128,5 +137,13 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 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
+  # Only allow execution by audio group
+  chown root:audio $PKG/usr/bin/$PRGNAM*
+  chmod 0750 $PKG/usr/bin/$PRGNAM*
+fi
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/calf/calf.desktop b/audio/calf/calf.desktop
index fddc1e2391..a5d65f428e 100644
--- a/audio/calf/calf.desktop
+++ b/audio/calf/calf.desktop
@@ -1,8 +1,10 @@
 [Desktop Entry]
 Name=Calf Plugin Pack for JACK
 Name[pl]=Zestaw wtyczek Calf
+Name[ru]=Набор эффектов и инструментов Calf для JACK
 Comment=Process and produce sounds using a set of plugins with JACK interface
 Comment[pl]=Przetwarzaj i generuj dźwięk używając zestawu wtyczek zgodnych z JACK
+Comment[ru]=Обработка и создание музыки при помощи эффектов и инструментов через JACK
 Exec=calfjackhost
 Terminal=false
 Type=Application
diff --git a/audio/calf/calf.info b/audio/calf/calf.info
index cd88930b7a..2376eeb51a 100644
--- a/audio/calf/calf.info
+++ b/audio/calf/calf.info
@@ -1,8 +1,8 @@
 PRGNAM="calf"
-VERSION="0.0.18.6"
-HOMEPAGE="http://sourceforge.net/projects/calf/"
-DOWNLOAD="http://downloads.sourceforge.net/calf/calf-0.0.18.6.tar.gz"
-MD5SUM="780854561dad1cb873041d7a0b98cbcd"
+VERSION="0.0.19kx"
+HOMEPAGE="http://kxstudio.sourceforge.net/Plugins"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/calf-0.0.19kx.tar.gz"
+MD5SUM="ba2147ddc53022ddf1ffdf28c3340a57"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dssi jack-audio-connection-kit ladspa_sdk lash slv2"
diff --git a/audio/calf/gcc47.patch b/audio/calf/gcc47.patch
deleted file mode 100644
index 7328a107ab..0000000000
--- a/audio/calf/gcc47.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur calf-0.0.18.6.orig/src/calf/benchmark.h calf-0.0.18.6/src/calf/benchmark.h
---- calf-0.0.18.6.orig/src/calf/benchmark.h	2010-08-22 23:25:15.000000000 +0200
-+++ calf-0.0.18.6/src/calf/benchmark.h	2012-09-15 21:25:28.194000789 +0200
-@@ -22,6 +22,7 @@
- #define __CALF_BENCHMAR_H
- 
- #include <time.h>
-+#include <unistd.h>
- #include <sys/time.h>
- #include <sys/resource.h>
- #include "primitives.h"
-diff -Naur calf-0.0.18.6.orig/src/osctlnet.cpp calf-0.0.18.6/src/osctlnet.cpp
---- calf-0.0.18.6.orig/src/osctlnet.cpp	2010-08-22 23:25:15.000000000 +0200
-+++ calf-0.0.18.6/src/osctlnet.cpp	2012-09-15 21:21:15.580000799 +0200
-@@ -26,6 +26,7 @@
- #include <stdlib.h>
- #include <sstream>
- #include <stdio.h>
-+#include <unistd.h>
- using namespace osctl;
- using namespace std;
- 
-diff -Naur calf-0.0.18.6.orig/src/preset.cpp calf-0.0.18.6/src/preset.cpp
---- calf-0.0.18.6.orig/src/preset.cpp	2010-08-22 23:25:15.000000000 +0200
-+++ calf-0.0.18.6/src/preset.cpp	2012-09-15 21:23:23.418997406 +0200
-@@ -22,6 +22,7 @@
- #include <config.h>
- #include <fcntl.h>
- #include <stdlib.h>
-+#include <unistd.h>
- #include <errno.h>
- #include <string.h>
- #include <sys/stat.h>
diff --git a/audio/calf/setcap.sh b/audio/calf/setcap.sh
new file mode 100644
index 0000000000..f6615e0bf1
--- /dev/null
+++ b/audio/calf/setcap.sh
@@ -0,0 +1,3 @@
+[ -x /sbin/setcap ] && [ -x usr/bin/calf_gtk ] && /sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/calf_gtk
+[ -x /sbin/setcap ] && [ -x usr/bin/calfjackhost ] && /sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/calfjackhost
+
diff --git a/audio/calf/slack-desc b/audio/calf/slack-desc
index fb81c835be..0eefa70461 100644
--- a/audio/calf/slack-desc
+++ b/audio/calf/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-calf: Calf (audio plugin pack for LADSPA, DSSI, LV2 and JACK)
+calf: calf (audio plugin pack for LADSPA, DSSI, LV2 and JACK)
 calf:
 calf: Calf audio plugin pack for LADSPA, DSSI, LV2 and JACK. Contains
 calf: effects (flanger, reverb, tape-like delay, phaser, rotary speaker,