7 files changed, 59 insertions, 6 deletions
diff --git a/audio/bristol/README b/audio/bristol/README
index 0681d5c91005b..b16806a8825ee 100644
--- a/audio/bristol/README
+++ b/audio/bristol/README
@@ -7,3 +7,9 @@ fail. I assume the bristol authors have a good reason for wanting this
 to happen, so I don't alter this behaviour. If you want to try, edit
 the SlackBuild and add --disable-version-check to the configure command.
 Otherwise, do a "removepkg bristol" before building.
+
+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/bristol/bristol.SlackBuild b/audio/bristol/bristol.SlackBuild
index 1df9947eeb975..c01512bd6e2fd 100644
--- a/audio/bristol/bristol.SlackBuild
+++ b/audio/bristol/bristol.SlackBuild
@@ -2,11 +2,13 @@
 
 # Slackware build script for bristol
 
-# Written by Zbigniew Baniewski, zb@ispid.com.pl (email no longer valid?)
+# Written by Zbigniew Baniewski, <zbigniew.baniewski@gmail.com>
 # Modified by B. Watson, yalhcru@gmail.com
 
+# Licensed under the WTFPL. See http://sam.zoy.org/wtfpl/ for details.
+
 PRGNAM=bristol
-VERSION=0.60.8
+VERSION=0.60.10
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,7 +45,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.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -79,8 +81,28 @@ install -m0644 AUTHORS COPYING COPYING.GPL NEWS README ChangeLog \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# icon rendered from bicon.svg
+mkdir -p $PKG/usr/share/pixmaps
+cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+
+# .desktop written for this SlackBuild
+mkdir -p $PKG/usr/share/applications
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
 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
+  PROGS="$PRGNAM brighton bristoljackstats"
+  cat $CWD/setcap.sh >> $PKG/install/doinst.sh
+  # Only allow execution by audio group
+  for file in $PROGS; do
+    chown root:audio $PKG/usr/bin/$file
+    chmod 0750 $PKG/usr/bin/$file
+  done
+fi
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/bristol/bristol.desktop b/audio/bristol/bristol.desktop
new file mode 100644
index 0000000000000..cdc17b3c58258
--- /dev/null
+++ b/audio/bristol/bristol.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Bristol
+GenericName=Synthesizer Emulator
+Type=Application
+Exec=startBristol
+Terminal=false
+Icon=bristol
+Categories=AudioVideo;Audio;
diff --git a/audio/bristol/bristol.info b/audio/bristol/bristol.info
index 2f461bd2da94e..f451ef75d8de3 100644
--- a/audio/bristol/bristol.info
+++ b/audio/bristol/bristol.info
@@ -1,8 +1,8 @@
 PRGNAM="bristol"
-VERSION="0.60.8"
+VERSION="0.60.10"
 HOMEPAGE="http://bristol.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/bristol/bristol-0.60.8.tar.gz"
-MD5SUM="0e4cef941ba53ccc64d654fea1e0d572"
+DOWNLOAD="http://downloads.sourceforge.net/bristol/bristol-0.60.10.tar.gz"
+MD5SUM="569ee025002c0de6a642f3130872c913"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack-audio-connection-kit liblo"
diff --git a/audio/bristol/bristol.png b/audio/bristol/bristol.png
new file mode 100644
index 0000000000000..e712025408f53
--- /dev/null
+++ b/audio/bristol/bristol.png
diff --git a/audio/bristol/doinst.sh b/audio/bristol/doinst.sh
new file mode 100644
index 0000000000000..bd8f3bab51089
--- /dev/null
+++ b/audio/bristol/doinst.sh
@@ -0,0 +1,11 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/audio/bristol/setcap.sh b/audio/bristol/setcap.sh
new file mode 100644
index 0000000000000..58bae5c73c942
--- /dev/null
+++ b/audio/bristol/setcap.sh
@@ -0,0 +1,6 @@
+if [ -x /sbin/setcap ]; then
+  for file in bristol brighton bristoljackstats; do
+    /sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/$file
+  done
+fi
+