diff options
author | Heinz Wiesinger <pprkut@liwjatan.at> | 2010-05-11 22:25:00 +0200 |
---|---|---|
committer | David Somero <xgizzmo@slackbuilds.org> | 2010-05-11 22:25:00 +0200 |
commit | 4431d461b67116441ace8e5c3caea6b0218ba141 (patch) | |
tree | eefd445cf22dd025f1ffe23ed22a08e4a3e19071 /multimedia | |
parent | 3f20f5a5bc78fc3a2c899ad876b8a1c113a654cc (diff) |
multimedia/x264: Updated for version 20081104
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/x264/README | 5 | ||||
-rw-r--r-- | multimedia/x264/doinst.sh | 10 | ||||
-rw-r--r-- | multimedia/x264/x264.SlackBuild | 32 | ||||
-rw-r--r-- | multimedia/x264/x264.desktop | 10 | ||||
-rw-r--r-- | multimedia/x264/x264.info | 12 |
5 files changed, 16 insertions, 53 deletions
diff --git a/multimedia/x264/README b/multimedia/x264/README index 662db861dcac5..5b57330de63ed 100644 --- a/multimedia/x264/README +++ b/multimedia/x264/README @@ -6,7 +6,4 @@ Eric Petit (OS X), Min Chen (vfw/asm), Justin Clay (vfw), Måns Rullgård, Radek Czyz, Christian Heine (asm), Alex Izvorski, and Alex Wright. It is released under the terms of the GPL license. -NOTe: -+ By default x264 it's gonna be builded without its GTK GUI, so - if you want to enable, set GTKUI variable to yes, like: - GTKUI=yes ./x264.SlackBuild +Requires yasm available from SlackBuilds.org. diff --git a/multimedia/x264/doinst.sh b/multimedia/x264/doinst.sh deleted file mode 100644 index 720a11ee901e6..0000000000000 --- a/multimedia/x264/doinst.sh +++ /dev/null @@ -1,10 +0,0 @@ - -( if [ -x usr/bin/update-desktop-database ]; then - usr/bin/update-desktop-database -q usr/share/applications - fi -) - -( if [ -x usr/bin/update-mime-database ]; then - usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 - fi -) diff --git a/multimedia/x264/x264.SlackBuild b/multimedia/x264/x264.SlackBuild index b8a5677b4c325..bb5d3dfbf6c43 100644 --- a/multimedia/x264/x264.SlackBuild +++ b/multimedia/x264/x264.SlackBuild @@ -1,17 +1,18 @@ #!/bin/sh -# Slackware build script for x264 +# Slackware build script for x264 # Written by core (eroc@linuxmail.org) +# Modified by Heinz Wiesinger <pprkut@liwjatan.at> set -e PRGNAM=x264 -VERSION=20070722 +VERSION=20081104 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} -GTKUI=${GTKUI:-no} TAG=${TAG:-_SBo} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -21,29 +22,24 @@ 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 rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar -jxvf $CWD/$PRGNAM-*-$VERSION-*.tar.bz2 +tar -xvf $CWD/$PRGNAM-*-$VERSION-*.tar.bz2 mv $PRGNAM-*-$VERSION-*/ $PRGNAM-$VERSION cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . -if [ "$GTKUI" = 'yes' ]; then - GTKUIOPT='--enable-gtk' -else - unset -v GTKUIOPT -fi - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - $GTKUIOPT \ --enable-pthread \ --enable-visualize \ --enable-shared @@ -51,17 +47,8 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) - -if [ "$GTKUI" = 'yes' ]; then - mkdir -p $PKG/usr/share/pixmaps - cp gtk/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png - mkdir -p $PKG/usr/share/applications - cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop -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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION @@ -69,7 +56,6 @@ 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 -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz diff --git a/multimedia/x264/x264.desktop b/multimedia/x264/x264.desktop deleted file mode 100644 index a18e869aa104d..0000000000000 --- a/multimedia/x264/x264.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=x264 -GenericName=H264/AVC Encoder -Comment=A free H264/AVC encoder -Icon=/usr/share/pixmaps/x264.png -Exec=x264_gtk_encode -Terminal=False -Type=Application -Categories=Application;AudioVideo diff --git a/multimedia/x264/x264.info b/multimedia/x264/x264.info index 701031f4323ac..8e76c75c77f3b 100644 --- a/multimedia/x264/x264.info +++ b/multimedia/x264/x264.info @@ -1,8 +1,8 @@ PRGNAM="x264" -VERSION="20070722" +VERSION="20081104" HOMEPAGE="http://www.videolan.org/developers/x264.html" -DOWNLOAD="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20070722-2245.tar.bz2" -MD5SUM="13efbc947b68fca8a861a0bbdaaba1cd" -MAINTAINER="core" -EMAIL="eroc@linuxmail.org" -APPROVED="alien" +DOWNLOAD="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20081104-2245.tar.bz2" +MD5SUM="23782a44487998a3a8dd46fcf69ff39e" +MAINTAINER="ppr:kut" +EMAIL="pprkut@liwjatan.at" +APPROVED="dsomero" |