multimedia/cinelerra: Updated for version cv_einar_701e5e5f

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>

1 files changed, 31 insertions, 14 deletions

diff --git a/multimedia/cinelerra/cinelerra.SlackBuild b/multimedia/cinelerra/cinelerra.SlackBuild
index e7f8c552f01ff..3c75d253b9491 100644
--- a/multimedia/cinelerra/cinelerra.SlackBuild
+++ b/multimedia/cinelerra/cinelerra.SlackBuild
@@ -2,10 +2,28 @@
 
 # Slackware build script for cinelerra
 
-# Written by Giovanne Castro <giovannefc@ig.com.br>
+# Copyright 2010 by Giovanne Castro, Campinas, Sao Paulo, Brazil <giovannefc@ig.com.br>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# 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.
+#
+# 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.
 
 PRGNAM=cinelerra
-VERSION=${VERSION:-cv_einar_cf708d7f}
+VERSION=${VERSION:-cv_einar_701e5e5f}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,14 +61,14 @@ else
 fi
 
 # --external-ffmpeg works only with version 0.5.x of FFMPEG.
-# Not compatible with FFPEG 0.6 series, in this case, cinelerra
+# Not compatible with FFMPEG 0.6 series, in this case, cinelerra
 # will be compiled with internal ffmpeg (includes in the package).
 # Uses "yes" or "no". Default: "no".
 EXTERNALFFMPEG=${EXTERNALFFMPEG:-no}
 
 if [ "$EXTERNALFFMPEG" = "no" ]; then
   externalffmpeg=""
-elif [ "$EXTERNALFFMPEG" = "yes" ]; then
+else
   externalffmpeg="--with-external-ffmpeg"
 fi
 
@@ -69,11 +87,11 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Patch for libpng 1.4.x and po_POTFILES.in (Fixed deleted files)
-patch -p1 < $CWD/shapewipe-libpng14.patch
-patch -p1 < $CWD/Fix_POTFILES.patch
+# Fix build with libx264 version 76 and later.
+patch -p1 < $CWD/x264_76.patch
 
 ./autogen.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -87,7 +105,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-pic \
   --with-x \
   --enable-opengl \
-  --with-buildinfo=git_cv_einar_$VERSION \
   --build=$ARCH-slackware-linux \
   $externalffmpeg \
   $mmx
@@ -95,6 +112,12 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+# Delete ffmpeg headers and libraries to prevent conflicts with ffmpeg package.
+if [ "$EXTERNALFFMPEG" = "no" ]; then
+  rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
+  rm -rf $PKG/usr/include/lib*
+fi
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -104,12 +127,6 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Delete ffmpeg headers and libraries to prevent conflicts with ffmpeg package
-if [ "$EXTERNALFFMPEG" = "no" ]; then
-  rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
-  rm -rf $PKG/usr/include/libav{codec,device,format,util}
-fi
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh