Updated to 2.5.2

1 files changed, 50 insertions, 13 deletions

diff --git a/avidemux/build/avidemux.SlackBuild b/avidemux/build/avidemux.SlackBuild
index 3e38163d..af71b845 100755
--- a/avidemux/build/avidemux.SlackBuild
+++ b/avidemux/build/avidemux.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2009  Eric Hameleers, Eindhoven, NL
+# Copyright 2009, 2010  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -35,6 +35,8 @@
 #               and used by default from the menu entry.
 # 2.4.4-2:    28/May/2009 by Eric Hameleers <alien@slackware.com>
 #             * Add aften (ac3 encoder) as a dependency
+# 2.5.2-1:    30/Jan/2010 by Eric Hameleers <alien@slackware.com>
+#             * New release.
 # 
 # Run 'sh avidemux.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -45,9 +47,8 @@
 # Set initial variables:
 
 PRGNAM=avidemux
-VERSION=${VERSION:-2.4.4}
-ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.5.2}
+BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
 
@@ -68,12 +69,15 @@ SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}_${VERSION}.tar.gz"
 ## --- with a little luck, you won't have to edit below this point --- ##
 ##
 
-# Exit the script on errors:
-set -e
-trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
-# Catch unitialized variables:
-set -u
-P1=${1:-1}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 case "$ARCH" in
   i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -88,11 +92,18 @@ case "$ARCH" in
   x86_64)    SLKCFLAGS="-O2 -fPIC"
              SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
-  athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
+  *)         SLKCFLAGS="-O2"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
 esac
 
+# Exit the script on errors:
+set -e
+trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
+# Catch unitialized variables:
+set -u
+P1=${1:-1}
+
 # Create working directories:
 mkdir -p $OUTPUT          # place for the package to be saved
 mkdir -p $TMP/tmp-$PRGNAM # location to build the source
@@ -136,12 +147,12 @@ cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
 cd ${PRGNAM}_${VERSION}
-cat $SRCDIR/avidemux-2.4_i18n.diff | patch -p1 --verbose 2>&1 \
+cat $SRCDIR/avidemux-2.5_i18n.diff | patch -p1 --verbose 2>&1 \
   | tee $OUTPUT/patch-${PRGNAM}.log
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-echo Building ...
+echo Building core ...
 mkdir -p build
 cd build
   cmake \
@@ -155,9 +166,27 @@ cd build
   make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
   make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
 cd -
+echo Building plugins ...
+mkdir -p build_plugins
+cd build_plugins
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DAVIDEMUX_SOURCE_DIR=$(cd .. ; pwd) \
+    -DAVIDEMUX_CORECONFIG_DIR=$(cd .. ; pwd)/build/config \
+    -DAVIDEMUX_INSTALL_PREFIX=$(cd .. ; pwd)/build \
+    ../plugins
+  make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+  make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
+cd -
 
 # Add the menu entry:
 mkdir -p $PKG/usr/share/{applications,pixmaps}
+mkdir -p $PKG/usr/share/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
 # If the qt4 binary was built, we prefer to use that over the gtk version:
 if [ -x $PKG/usr/bin/avidemux2_qt4 ]; then
   cat avidemux2.desktop | sed -e 's/_gtk/_qt4/' \
@@ -166,6 +195,14 @@ else
   install -m644 avidemux2.desktop $PKG/usr/share/applications/avidemux2.desktop
 fi
 install -m644 avidemux_icon.png $PKG/usr/share/pixmaps/avidemux.png 
+install -m644 avidemux_icon.png \
+  ${PKG}/usr/share/icons/hicolor/64x64/apps/avidemux.png
+convert avidemux_icon.png -resize 16x16 \
+  ${PKG}/usr/share/icons/hicolor/16x16/apps/avidemux.png
+convert avidemux_icon.png -resize 32x32 \
+  ${PKG}/usr/share/icons/hicolor/32x32/apps/avidemux.png
+convert avidemux_icon.png -resize 48x48 \
+  ${PKG}/usr/share/icons/hicolor/48x48/apps/avidemux.png
 
 # Add this to the doinst.sh:
 ! [ -d $PKG/install ] && mkdir -p $PKG/install