diff options
| -rw-r--r-- | multimedia/LiVES/LiVES.SlackBuild | 27 | ||||
| -rw-r--r-- | multimedia/LiVES/LiVES.info | 8 | ||||
| -rw-r--r-- | multimedia/LiVES/LiVES.patch | 11 | ||||
| -rw-r--r-- | multimedia/LiVES/README | 14 | ||||
| -rw-r--r-- | multimedia/LiVES/doinst.sh | 4 | ||||
| -rw-r--r-- | multimedia/LiVES/slack-desc | 4 |
6 files changed, 51 insertions, 17 deletions
diff --git a/multimedia/LiVES/LiVES.SlackBuild b/multimedia/LiVES/LiVES.SlackBuild index 15326cda85a93..aaef63a8b9257 100644 --- a/multimedia/LiVES/LiVES.SlackBuild +++ b/multimedia/LiVES/LiVES.SlackBuild @@ -8,16 +8,16 @@ # at slackbuilds.org PRGNAM=LiVES -VERSION=1.3.4 +VERSION=1.6.1 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac fi CWD=$(pwd) @@ -41,12 +41,19 @@ fi set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 mv lives-$VERSION $PRGNAM-$VERSION +if [ $PULSE = "yes" ]; then + echo "Pulse patch NOT applied." + echo "If this build fails, then you probably do not have pulse audio;" + echo "Try again without the PULSE=yes flag." +else + patch -p1 $PRGNAM-$VERSION/src/callbacks.c $CWD/LiVES.patch +fi cd $PRGNAM-$VERSION chown -R root:root . chmod -R a-s,u+w,g-w+r,o-w+r . @@ -69,6 +76,12 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +# Fix a broken symlink. +cd $PKG/usr/bin +rm -f lives +ln -sf lives-exe lives 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 94f1dde9bee76..3a428fc3da4f9 100644 --- a/multimedia/LiVES/LiVES.info +++ b/multimedia/LiVES/LiVES.info @@ -1,10 +1,10 @@ PRGNAM="LiVES" -VERSION="1.3.4" +VERSION="1.6.1" HOMEPAGE="http://lives.sourceforge.net" -DOWNLOAD="http://www.xs4all.nl/%7Esalsaman/lives/current/LiVES-1.3.4.tar.bz2" -MD5SUM="aeedd75386aa64004ad0831fdbf29cee" +DOWNLOAD="http://www.xs4all.nl/~salsaman/lives/current/LiVES-1.6.1.tar.bz2" +MD5SUM="8c1e79592c9f40c16aff268f0ff104f1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="klaatu" EMAIL="klaatu@hackerpublicradio.org" -APPROVED="rworkman" +APPROVED="dsomero" diff --git a/multimedia/LiVES/LiVES.patch b/multimedia/LiVES/LiVES.patch new file mode 100644 index 0000000000000..a6f269edc43bc --- /dev/null +++ b/multimedia/LiVES/LiVES.patch @@ -0,0 +1,11 @@ +--- trunk/src/callbacks.c 2012/03/23 01:30:32 1462 ++++ trunk/src/callbacks.c 2012/03/30 22:41:23 1465 +@@ -3999,7 +3999,7 @@ + lives_alarm_clear(alarm_handle); + frames_written=mainw->jackd->frames_written; + seek_pos=mainw->jackd->seek_pos; +- audio_ticks=mainw->pulsed->audio_ticks; ++ audio_ticks=mainw->jackd->audio_ticks; + + jack_message.command=ASERVER_CMD_FILE_CLOSE; + jack_message.data=NULL;
\ No newline at end of file diff --git a/multimedia/LiVES/README b/multimedia/LiVES/README index 356d7059bc7af..8a6db82df20f0 100644 --- a/multimedia/LiVES/README +++ b/multimedia/LiVES/README @@ -1,6 +1,12 @@ -LiVES is a frame and sample accurate realtime and non-linear video editor. -Features include keyboard-based editing, a dedicated clip editor, JACK -support, realtime effects, support for most major multimedia formats, the +LiVES is a frame and sample accurate realtime and non-linear video editor. +Features include keyboard-based editing, a dedicated clip editor, JACK +support, realtime effects, support for most major multimedia formats, the ability to be used for live VJ'ing, and much more. -mjpegtools, transcode, and jack are optional but strongly recommended. +In the unlikely event that you are running Pulse Audio on Slackware, you +should use the build option PULSE=yes but the default assumes you do NOT +have Pulse and applies an important patch to turn Pulse options off. In +other words, most people will NOT use any build option here. + +mjpegtools, transcode, and jack-audio-connection-kit are optional but +strongly recommended. diff --git a/multimedia/LiVES/doinst.sh b/multimedia/LiVES/doinst.sh new file mode 100644 index 0000000000000..392c12adb9bd3 --- /dev/null +++ b/multimedia/LiVES/doinst.sh @@ -0,0 +1,4 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications +fi + diff --git a/multimedia/LiVES/slack-desc b/multimedia/LiVES/slack-desc index 1fe97e5d4d224..0eb5364f9dea6 100644 --- a/multimedia/LiVES/slack-desc +++ b/multimedia/LiVES/slack-desc @@ -8,10 +8,10 @@ |-----handy-ruler------------------------------------------------------| LiVES: LiVES (a Video Editing System) LiVES: -LiVES: LiVES is a frame and sample accurate realtime and non-linear +LiVES: LiVES is a frame and sample accurate realtime and non-linear LiVES: video editor. Features include keyboard-based editing, a dedicated LiVES: clip editor, JACK support, realtime effects, support for most major -LiVES: multimedia formats. +LiVES: multimedia formats. LiVES: LiVES: For more information, see http://lives.sourceforge.net LiVES: |