diff options
| 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 |
| commit | b5f28bd83da9611c97df8de854878da530e6bd53 (patch) | |
| tree | e5ae15f3b5b482885b50769189ea065c775f9a16 /audio/faac/faac.SlackBuild | |
| parent | e01394e741203a3e8f888449da00bd5e35ca8287 (diff) | |
| download | slackbuilds-b5f28bd83da9611c97df8de854878da530e6bd53.tar.gz | |
audio/faac: Updated for version 1.28
Diffstat (limited to 'audio/faac/faac.SlackBuild')
| -rw-r--r-- | audio/faac/faac.SlackBuild | 14 |
1 files changed, 13 insertions, 1 deletions
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 |