diff options
| -rw-r--r-- | multimedia/avidemux/avidemux-2.4.3-i18n.patch.gz | bin | 0 -> 589 bytes | |||
| -rw-r--r-- | multimedia/avidemux/avidemux-2.4.3-x264.patch.gz | bin | 0 -> 589 bytes | |||
| -rw-r--r-- | multimedia/avidemux/avidemux.SlackBuild | 16 | ||||
| -rw-r--r-- | multimedia/avidemux/avidemux.info | 10 | ||||
| -rw-r--r-- | multimedia/avidemux/doinst.sh | 4 | ||||
| -rw-r--r-- | multimedia/avidemux/libdca.patch | 12 | ||||
| -rw-r--r-- | multimedia/avidemux/libdca.patch.gz | bin | 0 -> 285 bytes |
7 files changed, 21 insertions, 21 deletions
diff --git a/multimedia/avidemux/avidemux-2.4.3-i18n.patch.gz b/multimedia/avidemux/avidemux-2.4.3-i18n.patch.gz Binary files differnew file mode 100644 index 0000000000..9c62e85d42 --- /dev/null +++ b/multimedia/avidemux/avidemux-2.4.3-i18n.patch.gz diff --git a/multimedia/avidemux/avidemux-2.4.3-x264.patch.gz b/multimedia/avidemux/avidemux-2.4.3-x264.patch.gz Binary files differnew file mode 100644 index 0000000000..5777fd7bd4 --- /dev/null +++ b/multimedia/avidemux/avidemux-2.4.3-x264.patch.gz diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild index 1732060ca1..e05eda86a9 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 +VERSION=2.4.3 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -40,6 +40,8 @@ if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" fi set -e @@ -56,7 +58,11 @@ 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 -patch -p1 --verbose --suffix=.orig < $CWD/libdca.patch +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" \ @@ -66,6 +72,7 @@ cmake . \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_VERBOSE_MAKEFILE:BOOL="TRUE" \ + # Here are some valid options for cmake to build or not build against a dep # (for those who aren't very familiar with cmake) # Note that none of them should be needed though, as cmake automatically @@ -101,7 +108,7 @@ 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 + 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 ) @@ -114,12 +121,13 @@ cat avidemux2.desktop > $PKG/usr/share/applications/avidemux2.desktop cat avidemux_icon.png > $PKG/usr/share/pixmaps/avidemux.png mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL README TODO History \ +cp -a AUTHORS ChangeLog COPYING History INSTALL README TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info index 4dc54486ca..48bedcc5ae 100644 --- a/multimedia/avidemux/avidemux.info +++ b/multimedia/avidemux/avidemux.info @@ -1,8 +1,8 @@ PRGNAM="avidemux" -VERSION="2.4" +VERSION="2.4.3" HOMEPAGE="http://avidemux.org" -DOWNLOAD="http://download.berlios.de/avidemux/avidemux_2.4.tar.gz" -MD5SUM="2a752b9f6bab4123566894a6a21b353b" +DOWNLOAD="http://download.berlios.de/avidemux/avidemux_2.4.3.tar.gz" +MD5SUM="ff8e6ac186321e7e8bec9f8177df3724" MAINTAINER="Niklas 'Nille' Åkerström" -EMAIL="Nille_kungen[AT]hotmail.com" -APPROVED="rworkman" +EMAIL="Nille.kungen[AT]gmail.com" +APPROVED="dsomero"
\ No newline at end of file diff --git a/multimedia/avidemux/doinst.sh b/multimedia/avidemux/doinst.sh new file mode 100644 index 0000000000..65028cbc6a --- /dev/null +++ b/multimedia/avidemux/doinst.sh @@ -0,0 +1,4 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications +fi + diff --git a/multimedia/avidemux/libdca.patch b/multimedia/avidemux/libdca.patch deleted file mode 100644 index d679785478..0000000000 --- a/multimedia/avidemux/libdca.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur avidemux_2.4.orig/ConfigureChecks.cmake avidemux_2.4/ConfigureChecks.cmake ---- avidemux_2.4.orig/ConfigureChecks.cmake 2007-12-04 14:52:16.000000000 +0100 -+++ avidemux_2.4/ConfigureChecks.cmake 2007-12-23 04:10:19.000000000 +0100 -@@ -441,7 +441,7 @@ - IF (USE_LATE_BINDING) - CHECK_INCLUDE_FILES(dts.h USE_LIBDCA) - ELSE (USE_LATE_BINDING) -- ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA) -+ ADM_CHECK_HL(libdca dts.h dca dca_init USE_LIBDCA) - ENDIF (USE_LATE_BINDING) - - SET(CMAKE_REQUIRED_LIBRARIES) diff --git a/multimedia/avidemux/libdca.patch.gz b/multimedia/avidemux/libdca.patch.gz Binary files differnew file mode 100644 index 0000000000..556b3fc8c3 --- /dev/null +++ b/multimedia/avidemux/libdca.patch.gz |