summaryrefslogtreecommitdiffstats
path: root/audio/faac
diff options
context:
space:
mode:
author Niklas Nille Åkerström <nille.kungen[AT]gmail.com>2010-05-13 00:21:01 +0200
committer Robby Workman <rworkman@slackbuilds.org>2010-05-13 00:21:01 +0200
commitb5f28bd83da9611c97df8de854878da530e6bd53 (patch)
treee5ae15f3b5b482885b50769189ea065c775f9a16 /audio/faac
parente01394e741203a3e8f888449da00bd5e35ca8287 (diff)
downloadslackbuilds-b5f28bd83da9611c97df8de854878da530e6bd53.tar.gz
slackbuilds-b5f28bd83da9611c97df8de854878da530e6bd53.tar.xz
audio/faac: Updated for version 1.28
Diffstat (limited to 'audio/faac')
-rw-r--r--audio/faac/README12
-rw-r--r--audio/faac/faac.SlackBuild14
-rw-r--r--audio/faac/faac.info2
-rw-r--r--audio/faac/slack-desc4
4 files changed, 20 insertions, 12 deletions
diff --git a/audio/faac/README b/audio/faac/README
index dc17a62766..e0da35357a 100644
--- a/audio/faac/README
+++ b/audio/faac/README
@@ -2,14 +2,4 @@ FAAC is an Advanced Audio Coder (MPEG2-AAC, MPEG4-AAC).
The goal of FAAC is to explore the possibilities of AAC and exceed
the quality of the currently best MP3 encoders.
-faac comes with its own version of libmp4v2, but if you use it, you have to
-uninstall faac everytime you want to update it, as faac would otherwise
-detect the already installed libmp4v2 and build against it. Then, when you
-upgrade to the new package, it doesn't have the included libmp4v2, because
-it was part of the old package, so faac is linking to a nonexistent library
-after the upgrade. Long story short, we strongly recommend using the
-external libmp4v2 (available from SlackBuilds.org); just make sure it is
-installed when you configure faac, and it will be detected automatically.
-
-NOTE: If you have installed faac < 1.26-i486-2_SBo, make sure to remove it
-before either installing libmp4v2 or running the new SlackBuild.
+libmp4v2 is strongly recommended, but not required.
diff --git a/audio/faac/faac.SlackBuild b/audio/faac/faac.SlackBuild
index a0b687885e..342ade25d7 100644
--- a/audio/faac/faac.SlackBuild
+++ b/audio/faac/faac.SlackBuild
@@ -38,10 +38,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
# Seems that libmp4v2 is a complicated critter. Here's how we think it works:
@@ -54,6 +57,14 @@ fi
# Therefore, we'll default to use --without-mp4v2, which should produce the
# desired result in every case *except* where one wants to use the internal
# implementation, and that creates other problems, so we don't support it.
+#
+# From what used to be in our README:
+# faac comes with its own version of libmp4v2, but if you use it, you have to
+# uninstall faac everytime you want to update it, as faac would otherwise
+# detect the already installed libmp4v2 and build against it. Then, when you
+# upgrade to the new package, it doesn't have the included libmp4v2, because
+# it was part of the old package, so faac is linking to a nonexistent library
+# after the upgrade.
set -e
@@ -74,6 +85,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
--enable-shared=yes \
--enable-static=no \
@@ -99,7 +111,7 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
if [ "$1" = "--cleanup" ]; then
rm -rf $PKG $TMP/$PRGNAM-$VERSION
diff --git a/audio/faac/faac.info b/audio/faac/faac.info
index 3bb92f579c..4cdbc2f82b 100644
--- a/audio/faac/faac.info
+++ b/audio/faac/faac.info
@@ -2,7 +2,9 @@ PRGNAM="faac"
VERSION="1.28"
HOMEPAGE="http://sourceforge.net/projects/faac"
DOWNLOAD="http://downloads.sourceforge.net/faac/faac-1.28.tar.bz2"
+DOWNLOAD_x86_64=""
MD5SUM="c5dde68840cefe46532089c9392d1df0"
+MD5SUM_x86_64=""
MAINTAINER="Niklas 'Nille' kerstrm"
EMAIL="nille.kungen[AT]gmail.com"
APPROVED="rworkman"
diff --git a/audio/faac/slack-desc b/audio/faac/slack-desc
index 37697d8c7f..353e0382da 100644
--- a/audio/faac/slack-desc
+++ b/audio/faac/slack-desc
@@ -13,3 +13,7 @@ faac: The goal of FAAC is to explore the possibilities of AAC
faac: and exceed the quality of the currently best MP3 encoders.
faac:
faac: Homepage: http://sourceforge.net/projects/faac
+faac:
+faac:
+faac:
+faac: