From eb194048695c76c3eb1040aaa0ae12f7f4ee9734 Mon Sep 17 00:00:00 2001 From: Heinz Wiesinger Date: Wed, 27 Aug 2014 00:25:42 +0200 Subject: multimedia/ffmpeg: Updated for version 2.1.5. Added option to build against pulseaudio. Allow doc copying to work with newer versions. Signed-off-by: Matteo Bernardini --- multimedia/ffmpeg/README | 1 + multimedia/ffmpeg/ffmpeg.SlackBuild | 9 ++++++--- multimedia/ffmpeg/ffmpeg.info | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'multimedia') diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README index 35783feae2..4737373543 100644 --- a/multimedia/ffmpeg/README +++ b/multimedia/ffmpeg/README @@ -21,6 +21,7 @@ OPENAL=yes|no (default: no), requires OpenAL OPENCORE=yes|no (default: no), requires opencore-amr OPENSSL=yes|no (default: no), creates non-redistributable binary OPUS=yes|no (default: no), requires opus +PULSEAUDIO=yes|no (default: no), requires pulseaudio RTMP=yes|no (default: no), requires rtmpdump SCHROEDINGER=yes|no (default: no), requires schroedinger SPEEX=yes|no (default: no), requires speex diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild index e3d8aaa3d1..f59e7263a1 100644 --- a/multimedia/ffmpeg/ffmpeg.SlackBuild +++ b/multimedia/ffmpeg/ffmpeg.SlackBuild @@ -26,7 +26,7 @@ # Modified by Robby Workman PRGNAM=ffmpeg -VERSION=${VERSION:-2.1} +VERSION=${VERSION:-2.1.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -93,6 +93,7 @@ libmodplug=""; [ "${MODPLUG:-no}" != "no" ] && libmodplug="--enable-libmod libopus=""; [ "${OPUS:-no}" != "no" ] && libopus="--enable-libopus" libtwolame=""; [ "${TWOLAME:-no}" != "no" ] && libtwolame="--enable-libtwolame" ladspa=""; [ "${LADSPA:-no}" != "no" ] && ladspa="--enable-ladspa" +pulse=""; [ "${PULSEAUDIO:-no}" != "no" ] && pulse="--enable-libpulse" #opencl=""; [ "${OPENCL:-no}" != "no" ] && opencl="--enable-opencl" opencore_amr="" ; [ "${OPENCORE:-no}" != "no" ] && \ @@ -174,6 +175,7 @@ CXXFLAGS="$SLKCFLAGS" \ $libopus \ $libtwolame \ $ladspa \ + $pulse \ $ssl make @@ -186,9 +188,10 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/txt -cp -a Changelog COPYING* CREDITS INSTALL LICENSE MAINTAINERS README RELEASE \ - VERSION doc/RELEASE_NOTES $PKG/usr/doc/$PRGNAM-$VERSION +cp -a Changelog COPYING* CREDITS INSTALL* LICENSE* MAINTAINERS README* RELEASE \ + VERSION $PKG/usr/doc/$PRGNAM-$VERSION cp -a doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION/txt/ +find . -name "RELEASE_NOTES" -exec cp -a {} $PKG/usr/doc/$PRGNAM-$VERSION/ \; cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/multimedia/ffmpeg/ffmpeg.info b/multimedia/ffmpeg/ffmpeg.info index 016ccbfe64..0076372a53 100644 --- a/multimedia/ffmpeg/ffmpeg.info +++ b/multimedia/ffmpeg/ffmpeg.info @@ -1,8 +1,8 @@ PRGNAM="ffmpeg" -VERSION="2.1" +VERSION="2.1.5" HOMEPAGE="http://www.ffmpeg.org" -DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-2.1.tar.bz2" -MD5SUM="4ec1cedd4c7753512462f70b347c338a" +DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-2.1.5.tar.bz2" +MD5SUM="c97586adb18e61f56b819b6ebb1d6a1d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README% lame x264" -- cgit v1.2.3