audio/jack-tools: Updated for version 20141211.

6 files changed, 38 insertions, 6 deletions

diff --git a/audio/jack-tools/README b/audio/jack-tools/README
index 66e8c26722df..7d82241c8b6f 100644
--- a/audio/jack-tools/README
+++ b/audio/jack-tools/README
@@ -11,3 +11,9 @@ jack-record - JACK Capture Client
 jack-scope - JACK Oscilloscope
 jack-transport - Minimalist Jack Transport Interface
 jack-udp - JACK UDP Transport Client
+
+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/jack-tools/jack-tools.SlackBuild b/audio/jack-tools/jack-tools.SlackBuild
index ade1c9e96e1a..918ddd246339 100644
--- a/audio/jack-tools/jack-tools.SlackBuild
+++ b/audio/jack-tools/jack-tools.SlackBuild
@@ -4,10 +4,18 @@
 
 # Written by B. Watson (yalhcru@gmail.com)
 
+# 20151110 bkw:
+# - Updated for 20141211. This is the date of the latest darcs
+#   commit. Note that the c-common/ in the source tarball is the
+#   old one (from my jack-tools-20130616.tar.gz), since jack-tools
+#   won't compile against the latest c-common. Only jack-scope
+#   and jack-play have changed.
+# - Add capability stuff.
+
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=jack-tools
-VERSION=${VERSION:-20130616}
+VERSION=${VERSION:-20141211}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,7 +63,7 @@ mkdir -p $PKG/usr/bin $PKG/usr/include
 make install prefix=$PKG/usr
 strip $PKG/usr/bin/*
 
-# man pages generated from *.text asciidoc files, then manually edited
+# man pages generated from *.ad asciidoc files, then manually edited
 # to clean up the formatting.
 mkdir -p $PKG/usr/man/man1
 for page in $CWD/man/*.1; do
@@ -69,5 +77,12 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
+# Only add capability stuff if not disabled:
+if [ "${SETCAP:-yes}" = "yes" ]; then
+  cat $CWD/setcap.sh >> $PKG/install/doinst.sh
+  chown root:audio $PKG/usr/bin/*
+  chmod 0750 $PKG/usr/bin/*
+fi
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/jack-tools/jack-tools.info b/audio/jack-tools/jack-tools.info
index 7b2c80f11497..824e6662ed39 100644
--- a/audio/jack-tools/jack-tools.info
+++ b/audio/jack-tools/jack-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="jack-tools"
-VERSION="20130616"
+VERSION="20141211"
 HOMEPAGE="http://rd.slavepianos.org/?t=rju"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/jack-tools-20130616.tar.gz"
-MD5SUM="69e5c61fa6ad1d01262ccacebb3f405f"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/jack-tools-20141211.tar.gz"
+MD5SUM="6ad8e71fcab77b79fa6dffb0533b3278"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack-audio-connection-kit liblo"
diff --git a/audio/jack-tools/man/jack-play.1 b/audio/jack-tools/man/jack-play.1
index 1b7364e0728b..52d088b1c8ec 100644
--- a/audio/jack-tools/man/jack-play.1
+++ b/audio/jack-tools/man/jack-play.1
@@ -38,10 +38,14 @@ jack\-play [options] sound\-file\&...
 .sp
 \fB\-c\fR : Set the sample rate conversion algorithm (default=2)\&. Values are: SRC_SINC_BEST_QUALITY = 0, SRC_SINC_MEDIUM_QUALITY = 1, SRC_SINC_FASTEST = 2, SRC_ZERO_ORDER_HOLD = 3 and SRC_LINEAR = 4\&.
 .sp
+\fB\-d\fR : Set the destination port pattern, overrides environment variable\&.
+.sp
 \fB\-i\fR : Set the initial disk seek in frames (default=0)\&.
 .sp
 \fB\-m\fR : Set the minimal disk transfer size in frames (default=32)\&. This is an optimization switch\&.
 .sp
+\fB\-l\fR : Loop input file indefinitely\&.
+.sp
 \fB\-n\fR : Set the client name (default=jack\-play)\&.
 .sp
 \fB\-q\fR : Set the frame size to request data from the ringbuffer (default=64)\&. This is an optimization switch\&.
@@ -53,7 +57,7 @@ jack\-play [options] sound\-file\&...
 \fB\-u\fR : Do not make client name unique by appending process identifier\&.
 .SH "DESCRIPTION"
 .sp
-jack\-play is a light\-weight JACK sound file player\&. It creates as many output ports as there are channels in the input file\&. It will connect to ports mentioned in the environment variable JACK_PLAY_CONNECT_TO which must include a %d pattern to indicate port number, otherwise it implements no connection logic, use jack\-plumbing(1) instead\&.
+jack\-play is a light\-weight JACK sound file player\&. It creates as many output ports as there are channels in the input file\&. It will connect to ports mentioned at \fB\-p\fR or in the environment variable JACK_PLAY_CONNECT_TO which must include a %d pattern to indicate port number, otherwise it implements no connection logic, use jack\-plumbing(1) instead\&.
 .sp
 jack\-play will read files in any format supported by libsndfile, and will resample to match the server sample rate using libsamplerate\&.
 .SH "AUTHOR"
diff --git a/audio/jack-tools/man/jack-scope.1 b/audio/jack-tools/man/jack-scope.1
index b5d594f1927a..42ada4558d5c 100644
--- a/audio/jack-tools/man/jack-scope.1
+++ b/audio/jack-tools/man/jack-scope.1
@@ -46,6 +46,8 @@ jack\-scope [options]
 .sp
 \fB\-p\fR : A pattern describing the JACK ports to connect to, ie\&. SuperCollider:out_%d (default=nil)\&. If this is not set consults the environment variable JACK_SCOPE_CONNECT_TO\&.
 .sp
+\fB\-s\fR : Set the drawing style for signal mode (default=dot)\&.
+.sp
 \fB\-u\fR : Set the UDP port number to listen for OSC packets on (default=57140)\&.
 .sp
 \fB\-w\fR : Set the scope size in pixels (default=512)\&. The scope window is square\&.
diff --git a/audio/jack-tools/setcap.sh b/audio/jack-tools/setcap.sh
new file mode 100644
index 000000000000..93f5db1c7eed
--- /dev/null
+++ b/audio/jack-tools/setcap.sh
@@ -0,0 +1,5 @@
+if [ -x /sbin/setcap ]; then
+  for i in jack-dl jack-osc jack-play jack-plumbing jack-record jack-scope jack-transport jack-udp; do
+    /sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/$i
+  done
+fi