6 files changed, 97 insertions, 45 deletions
diff --git a/multimedia/lives/README b/multimedia/lives/README
index 57e64904ee..b33d4626e2 100644
--- a/multimedia/lives/README
+++ b/multimedia/lives/README
@@ -1,7 +1,30 @@
-LiVES is a Video Editing System
+LiVES is a Video Editing System. It is designed to be simple to use,
+yet powerful. It is small in size, yet it has many advanced features.
 
-It is designed to be simple to use, yet powerful. 
-It is small in size, yet it has many advanced features.
+LiVES mixes realtime video performance and non-linear editing in one
+professional quality application. It will let you start editing and
+making video right away, without having to worry about formats, frame
+sizes, or framerates. It is a very flexible tool which is used by
+both professional VJ's and video editors - mix and switch clips from
+the keyboard, use dozens of realtime effects, trim and edit your
+clips in the clip editor, and bring them together using the
+multitrack timeline. You can even record your performance in real
+time, and then edit it further or render it straight away.
 
-LiVES mixes realtime video performance and non-linear editing
-in one professional quality application.
+For the more technically minded, the application is frame and sample
+accurate, and it can be controlled remotely or scripted for use as a
+video server. And it supports all of the latest free standards.
+
+LiVES is good enough to be used as a VJ tool for professional
+performances, and as a video editor is capable of creating dazzling
+clips in a huge variety of formats.
+
+Optional dependencies:
+ffmpeg opencv mjpegtools ladspa_sdk libunicap libdv schroedinger
+frei0r libavc1394
+
+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/multimedia/lives/doinst.sh b/multimedia/lives/doinst.sh
new file mode 100644
index 0000000000..76cc38a548
--- /dev/null
+++ b/multimedia/lives/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database 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/multimedia/lives/lives.SlackBuild b/multimedia/lives/lives.SlackBuild
index 520d31abd4..4aba116a2c 100644
--- a/multimedia/lives/lives.SlackBuild
+++ b/multimedia/lives/lives.SlackBuild
@@ -1,29 +1,33 @@
 #!/bin/sh
 
-# Slackware build script for LiVES
+# Slackware build script for "lives".
 
-# Copyright (c) 2014, Yanes Checcacci Balod <yanes@pobox.com>, Brazil
+# Copyright -2015 Yanes Checcacci Balod <yanes@pobox.com>, Brazil
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
 # All rights reserved.
 #
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
+# Redistribution and use in source and binary forms, with or without
+# modification, are 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.
+# * Redistributions of source code 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.
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "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 COPYRIGHT
+# OWNER OR CONTRIBUTORS 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=lives
-VERSION=${VERSION:-2.2.2}
+SRCNAM=LiVES
+VERSION=${VERSION:-2.2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,43 +64,58 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvjf $CWD/LiVES-${VERSION}.tar.bz2
+tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# includes some multilib support
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
+WEED_LIBS="-L/usr/lib${LIBDIRSUFFIX}" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --build=$ARCH-slackware-linux \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-### FIX! Move /usr/share/doc/lives* to /usr/doc/LiVES* and remove DIRECTORY!!!
-mv $PKG/usr/share/doc/lives-$VERSION/* $PKG/usr/doc/$PRGNAM-$VERSION
+# --docdir isn't working
+mv $PKG/usr/share/doc/$PRGNAM-$VERSION/* $PKG/usr/doc/$PRGNAM-$VERSION
 rm -rf $PKG/usr/share/doc/
+cp -a \
+  ABOUT-NLS AUTHORS BUGS COPYING ChangeLog FEATURES GETTING.STARTED INSTALL \
+  NEWS README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-### FIX! re-linking locally "lives-exe" -> "lives"!
-cd $PKG/usr/bin && rm -f lives && ln -s lives-exe lives
+# symlink to relative path
+(
+  cd $PKG/usr/bin && rm -f lives && ln -s lives-exe lives
+)
 
 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/*
+  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/multimedia/lives/lives.info b/multimedia/lives/lives.info
index 370cfa2505..758b9b2c6b 100644
--- a/multimedia/lives/lives.info
+++ b/multimedia/lives/lives.info
@@ -1,10 +1,10 @@
 PRGNAM="lives"
-VERSION="2.2.2"
-HOMEPAGE="hhttp://lives.sourceforge.net"
-DOWNLOAD="http://www.xs4all.nl/%7Esalsaman/lives/current/LiVES-2.2.2.tar.bz2"
-MD5SUM="c904da1cbb627927ea5c1ce3ea61db47"
+VERSION="2.2.6"
+HOMEPAGE="http://lives.sourceforge.net"
+DOWNLOAD="http://www.xs4all.nl/~salsaman/lives/current/LiVES-2.2.6.tar.bz2"
+MD5SUM="54e1043927d71282de9516df4a76c9cc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ffmpeg jack2 mjpegtools pulseaudio"
-MAINTAINER="Yanes Checcacci Balod"
-EMAIL="yanes@pobox.com"
+REQUIRES="jack2"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/multimedia/lives/setcap.sh b/multimedia/lives/setcap.sh
new file mode 100644
index 0000000000..25f30a0019
--- /dev/null
+++ b/multimedia/lives/setcap.sh
@@ -0,0 +1 @@
+[ -x /sbin/setcap ] && /sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/lives-exe
diff --git a/multimedia/lives/slack-desc b/multimedia/lives/slack-desc
index f674dd693a..698f956394 100644
--- a/multimedia/lives/slack-desc
+++ b/multimedia/lives/slack-desc
@@ -8,10 +8,10 @@
      |-----handy-ruler------------------------------------------------------|
 lives: lives (Video Editing System)
 lives: 
-lives: LiVES is a Free, Open Source video editor *and* a VJ tool.
+lives: LiVES is a Video Editing System. It is designed to be simple to use,
+lives: yet powerful. It is small in size, yet it has many advanced features.
 lives:
-lives:
-lives: LiVES website: http://lives.sourceforge.net/
+lives: Homepage: http://lives.sourceforge.net/
 lives:
 lives:
 lives: