diff options
| author | Danny Schmarsel <danny@schmarsel.de> | 2015-10-28 23:42:50 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2015-10-28 23:42:50 +0700 |
| commit | b0d2ce2b41e0e14c821c2e272a484b4b59f0eb2f (patch) | |
| tree | b841cebb6f2db95222ffd7fb4edb8c139eab68f2 | |
| parent | 2848fce4b43fe4fb3b2d20d1cc38950724ded170 (diff) | |
| download | slackbuilds-b0d2ce2b41e0e14c821c2e272a484b4b59f0eb2f.tar.gz | |
multimedia/cinelerra: Updated to use internal ffmpeg by default.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | multimedia/cinelerra/README | 7 | ||||
| -rw-r--r-- | multimedia/cinelerra/cinelerra.SlackBuild | 19 | ||||
| -rw-r--r-- | multimedia/cinelerra/cinelerra.info | 2 |
3 files changed, 25 insertions, 3 deletions
diff --git a/multimedia/cinelerra/README b/multimedia/cinelerra/README index 1e25a9bae5..6aef88e053 100644 --- a/multimedia/cinelerra/README +++ b/multimedia/cinelerra/README @@ -1,3 +1,10 @@ Cinelerra CV is the most advanced non-linear video editor and compositor for Linux. It does primarily 3 main things: capturing, compositing, and editing audio and video with sample level accuracy. + +NOTE: +Patches for ffmpeg-2.x from the official website are included in this SlackBuild. +These patches work for the most part, but in various cases (like loading multiple DNxHD files) +they make the program very unstable. + +If you still want to build with ffmpeg-2.x, pass "EXTERNALFFMPEG=yes" to the commandline. diff --git a/multimedia/cinelerra/cinelerra.SlackBuild b/multimedia/cinelerra/cinelerra.SlackBuild index ab3d600603..de42bbd6b5 100644 --- a/multimedia/cinelerra/cinelerra.SlackBuild +++ b/multimedia/cinelerra/cinelerra.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=cinelerra VERSION=${VERSION:-cv_2.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -60,6 +60,19 @@ else mmx="--enable-mmx" fi +# Patches for ffmpeg-2.x exist on the official website. +# While testing, the patches work for the most part, but +# in various cases (like loading multiple DNxHD files) +# they make the program very unstable. +# Defaulting to internal ffmpeg because of this. +EXTERNALFFMPEG=${EXTERNALFFMPEG:-no} + +if [ "$EXTERNALFFMPEG" = "no" ]; then + externalffmpeg="" +elif [ "$EXTERNALFFMPEG" = "yes" ]; then + externalffmpeg="--with-external-ffmpeg" +fi + set -e rm -rf $PKG @@ -75,9 +88,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +if [ "$EXTERNALFFMPEG" = "yes" ]; then # Patches (from the official website) for compatibility with ffmpeg-2.x patch -p1 < $CWD/patches/cinelerra-cv-ffmpeg_api2.2.patch patch -p1 < $CWD/patches/cinelerra-cv-ffmpeg2.0.patch +fi ./autogen.sh @@ -96,7 +111,7 @@ CXXFLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \ --with-x \ --enable-opengl \ --build=$ARCH-slackware-linux \ - --with-external-ffmpeg \ + $externalffmpeg \ $mmx make diff --git a/multimedia/cinelerra/cinelerra.info b/multimedia/cinelerra/cinelerra.info index d1284cffc2..e4a86572cb 100644 --- a/multimedia/cinelerra/cinelerra.info +++ b/multimedia/cinelerra/cinelerra.info @@ -5,6 +5,6 @@ DOWNLOAD="http://www.cinelerra-cv.org/releases/CinelerraCV-2.3.tar.xz" MD5SUM="a1e7bfaf9827f74900d58d25955bdf3f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="a52dec faac faad2 ffmpeg imlib2 libavc1394 libdv libiec61883 mjpegtools lame x264" +REQUIRES="a52dec faac faad2 imlib2 libavc1394 libdv libiec61883 mjpegtools lame x264" MAINTAINER="Danny Schmarsel" EMAIL="danny@schmarsel.de" |