diff options
| -rw-r--r-- | multimedia/avidemux/README | 3 | ||||
| -rw-r--r-- | multimedia/avidemux/avidemux-2.4.3-x264.patch.gz | bin | 589 -> 0 bytes | |||
| -rw-r--r-- | multimedia/avidemux/avidemux.SlackBuild | 23 | ||||
| -rw-r--r-- | multimedia/avidemux/avidemux.info | 8 | ||||
| -rw-r--r-- | multimedia/avidemux/libdca.patch.gz | bin | 285 -> 0 bytes | |||
| -rw-r--r-- | multimedia/avidemux/slack-desc | 3 |
6 files changed, 18 insertions, 19 deletions
diff --git a/multimedia/avidemux/README b/multimedia/avidemux/README index 554bc2f090..b4365ffa16 100644 --- a/multimedia/avidemux/README +++ b/multimedia/avidemux/README @@ -3,6 +3,9 @@ encoding tasks. It supports many file types, including AVI, DVD compatible MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated using projects, job queue and powerful scripting capabilities. +If you use qt4 run the script as 'QT4=yes ./avidemux.SlackBuild' +It will put the qt4 version in the desktop entry. + Requirements (all available at SlackBuilds.org): lame, faad2, faac, a52dec, libdca, xvidcore, and x264 diff --git a/multimedia/avidemux/avidemux-2.4.3-x264.patch.gz b/multimedia/avidemux/avidemux-2.4.3-x264.patch.gz Binary files differdeleted file mode 100644 index 5777fd7bd4..0000000000 --- a/multimedia/avidemux/avidemux-2.4.3-x264.patch.gz +++ /dev/null diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild index e05eda86a9..274a03f802 100644 --- a/multimedia/avidemux/avidemux.SlackBuild +++ b/multimedia/avidemux/avidemux.SlackBuild @@ -26,7 +26,7 @@ # project will use in the future. No additional license terms added PRGNAM=avidemux -VERSION=2.4.3 +VERSION=${VERSION:-2.4.4} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -35,6 +35,7 @@ CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +QT4=${QT4:-no} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -56,13 +57,8 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R a-s,u+w,go+r-w . -# Patch to build with newer libdca (tested with 0.0.5) -# If you're trying to use an older version of libdca, it's not supported here -zcat $CWD/libdca.patch.gz | patch -p1 --verbose --backup --suffix=.orig #Patch that installs i18n in the correct place evan if we compile with qt4 support zcat $CWD/avidemux-2.4.3-i18n.patch.gz | patch -p1 --verbose --backup --suffix=.orig -#Patch to compile against newer x264 thanks to gentoo and Heinz Wiesinger -zcat $CWD/avidemux-2.4.3-x264.patch.gz | patch -p1 --verbose --backup --suffix=.orig CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -105,12 +101,7 @@ cmake . \ # qt4 || -DNO_QT4:BOOL= make -make DESTDIR=$PKG install - -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null | true - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) +make DESTDIR=$PKG install/strip mkdir -p $PKG/usr/man/man1 cat man/avidemux.1 | gzip -9c > $PKG/usr/man/man1/avidemux.1.gz @@ -119,6 +110,10 @@ cd $TMP/$PRGNAM-$VERSION mkdir -p $PKG/usr/share/{applications,pixmaps} cat avidemux2.desktop > $PKG/usr/share/applications/avidemux2.desktop cat avidemux_icon.png > $PKG/usr/share/pixmaps/avidemux.png +#patch avidemux2.desktop to exec avidemux2_qt4 instead of avidemux2_gtk +if [ $QT4 != no ];then + sed -i 's/avidemux2_gtk/avidemux2_qt4/' $PKG/usr/share/applications/avidemux2.desktop +fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS ChangeLog COPYING History INSTALL README TODO \ @@ -131,3 +126,7 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz + +if [ "$1" = "--cleanup" ]; then + rm -rf $PKG $TMP/$PRGNAM-$VERSION + fi
\ No newline at end of file diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info index 48bedcc5ae..ef02b76fee 100644 --- a/multimedia/avidemux/avidemux.info +++ b/multimedia/avidemux/avidemux.info @@ -1,8 +1,8 @@ PRGNAM="avidemux" -VERSION="2.4.3" +VERSION="2.4.4" HOMEPAGE="http://avidemux.org" -DOWNLOAD="http://download.berlios.de/avidemux/avidemux_2.4.3.tar.gz" -MD5SUM="ff8e6ac186321e7e8bec9f8177df3724" +DOWNLOAD="http://downloads.sourceforge.net/avidemux/avidemux_2.4.4.tar.gz" +MD5SUM="503dfd25842ef81be7c769811e7bc54e" MAINTAINER="Niklas 'Nille' Åkerström" EMAIL="Nille.kungen[AT]gmail.com" -APPROVED="dsomero"
\ No newline at end of file +APPROVED="michiel" diff --git a/multimedia/avidemux/libdca.patch.gz b/multimedia/avidemux/libdca.patch.gz Binary files differdeleted file mode 100644 index 556b3fc8c3..0000000000 --- a/multimedia/avidemux/libdca.patch.gz +++ /dev/null diff --git a/multimedia/avidemux/slack-desc b/multimedia/avidemux/slack-desc index 9cb8eb398b..f3b936097d 100644 --- a/multimedia/avidemux/slack-desc +++ b/multimedia/avidemux/slack-desc @@ -14,6 +14,3 @@ avidemux: including AVI, DVD compatible MPEG files, MP4 and ASF, using avidemux: a variety of codecs. Tasks can be automated using projects, avidemux: job queue and powerful scripting capabilities. avidemux: -avidemux: -avidemux: -avidemux: |