Update toto 2.5.4

1 files changed, 34 insertions, 3 deletions

diff --git a/avidemux/build/avidemux.SlackBuild b/avidemux/build/avidemux.SlackBuild
index d3dda918..70986c9a 100755
--- a/avidemux/build/avidemux.SlackBuild
+++ b/avidemux/build/avidemux.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2009, 2010  Eric Hameleers, Eindhoven, NL
+# Copyright 2009, 2010, 2011  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -28,7 +28,7 @@
 # For:        avidemux
 # Descr:      versatile video editor with a Qt gui
 # URL:        http://avidemux.berlios.de/
-# Needs:      a52dec, faac, faad2, lame, libdca, opencore-amr, x264, xvidcore
+# Needs:      a52dec,faac,faad2,lame,libdca,libvpx,opencore-amr,x264,xvidcore
 # Changelog:  
 # 2.4.4-1:    19/May/2009 by Eric Hameleers <alien@slackware.com>
 #             * Initial build. If Qt4 is present the Qt4 GUI will be built
@@ -39,6 +39,8 @@
 #             * New release. Add support for AMR audio.
 # 2.5.3-1:    02/jun/2010 by Eric Hameleers <alien@slackware.com>
 #             * New release.
+# 2.5.4-1:    11/may/2011 by Eric Hameleers <alien@slackware.com>
+#             * New release. Added VP8 support.
 # 
 # Run 'sh avidemux.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -49,7 +51,7 @@
 # Set initial variables:
 
 PRGNAM=avidemux
-VERSION=${VERSION:-2.5.3}
+VERSION=${VERSION:-2.5.4}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
@@ -147,11 +149,28 @@ cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
 cd ${PRGNAM}_${VERSION}
+touch $OUTPUT/patch-${PRGNAM}.log
 
 ## Fix location of internationalisation files (no longer needed since 2.5.3):
 #cat $SRCDIR/avidemux-2.5_i18n.diff | patch -p1 --verbose 2>&1 \
 #  | tee $OUTPUT/patch-${PRGNAM}.log
 
+# Fix broken sound output in Qt interface:
+cat $SRCDIR/avidemux-2.5.4_audioDevice.patch | patch -p0 --verbose 2>&1 \
+  | tee -a $OUTPUT/patch-${PRGNAM}.log
+
+# Fix crash in the GTK dialog:
+cat $SRCDIR/avidemux-2.5.4_gtkmenu_crash.patch | patch -p0 --verbose 2>&1 \
+  | tee -a $OUTPUT/patch-${PRGNAM}.log
+
+# Fix compilation against recent snapshots of x264:
+cat $SRCDIR/avidemux-2.5.4_x264.patch | patch -p0 --verbose 2>&1 \
+  | tee -a $OUTPUT/patch-${PRGNAM}.log
+
+# Use correct X264 option with recent snapshots of x264:
+cat $SRCDIR/avidemux-2.5.4_x264_option.patch | patch -p0 --verbose 2>&1 \
+  | tee -a $OUTPUT/patch-${PRGNAM}.log
+
 if [ "$ARCH" = "x86_64" ]; then
   # Some paths are incorrectly hardcoded to "lib":
   sed -i -e "s/Dir=\"lib\"/Dir=\"lib${LIBDIRSUFFIX}\"/" $(grep -lr 'Dir="lib"' .)
@@ -221,6 +240,18 @@ if [ -x usr/bin/update-desktop-database ]; then
   chroot . /usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1
 fi
 
+# Update hicolor theme cache:
+if [ -d usr/share/icons/hicolor ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2>&1
+  fi
+fi
+
+# Update the mime database:
+if [ -x usr/bin/update-mime-database ]; then
+  chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
 EOT
 
 # Add documentation: