summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinz Wiesinger <pprkut@liwjatan.at>2010-05-13 00:35:19 +0200
committerRobby Workman <rworkman@slackbuilds.org>2010-05-13 00:35:19 +0200
commitd8eff7835c90b20f2ccbf999f8c681b01e08d4f3 (patch)
treedc6156aeb2cb07baf03ca7906b2dd6906d0d1a74
parent9fedb97894ea9738ebbb3b579d2e658f97f883aa (diff)
downloadslackbuilds-d8eff7835c90b20f2ccbf999f8c681b01e08d4f3.tar.gz
multimedia/x264: Updated for version 20090310
-rw-r--r--multimedia/x264/README4
-rw-r--r--multimedia/x264/x264.SlackBuild6
-rw-r--r--multimedia/x264/x264.info2
3 files changed, 8 insertions, 4 deletions
diff --git a/multimedia/x264/README b/multimedia/x264/README
index 5b57330de6..f4cdf1ec4d 100644
--- a/multimedia/x264/README
+++ b/multimedia/x264/README
@@ -1,9 +1,7 @@
-x264 - A free h264/avc encoder.
-
x264 is a free library for encoding H264/AVC video streams.
The code is written from scratch by Laurent Aimar, Loren Merritt,
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.
-Requires yasm available from SlackBuilds.org.
+This requires yasm.
diff --git a/multimedia/x264/x264.SlackBuild b/multimedia/x264/x264.SlackBuild
index 3f876e5bf2..4aa6e64f51 100644
--- a/multimedia/x264/x264.SlackBuild
+++ b/multimedia/x264/x264.SlackBuild
@@ -18,10 +18,13 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
set -e
@@ -40,6 +43,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--enable-pthread \
--enable-visualize \
--enable-shared
@@ -62,4 +66,4 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/x264/x264.info b/multimedia/x264/x264.info
index d4f582f8d4..5fa8dab24e 100644
--- a/multimedia/x264/x264.info
+++ b/multimedia/x264/x264.info
@@ -2,7 +2,9 @@ PRGNAM="x264"
VERSION="20090310"
HOMEPAGE="http://www.videolan.org/developers/x264.html"
DOWNLOAD="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20090310-2245.tar.bz2"
+DOWNLOAD_x86_64=""
MD5SUM="3257791376030331bb14db22d6c16b7f"
+MD5SUM_x86_64=""
MAINTAINER="ppr:kut"
EMAIL="pprkut@liwjatan.at"
APPROVED="rworkman"