6 files changed, 124 insertions, 76 deletions
diff --git a/audio/faac/README b/audio/faac/README
new file mode 100644
index 0000000000..dc17a62766
--- /dev/null
+++ b/audio/faac/README
@@ -0,0 +1,15 @@
+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.
diff --git a/audio/faac/faac.SlackBuild b/audio/faac/faac.SlackBuild
new file mode 100644
index 0000000000..4b1787a5ac
--- /dev/null
+++ b/audio/faac/faac.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for faac 
+
+# Copyright (c) 2008, Antonio Hernández Blas <hba.nihilismus@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 1.- Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Thanks to Carpo on LinuxQuestions.org for the tips
+# Thanks to Heinz Wiesinger for the information about faac and libmp4v2
+
+PRGNAM=faac
+VERSION=1.26
+ARCH=${ARCH:-i486}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+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
+
+# Seems that libmp4v2 is a complicated critter. Here's how we think it works:
+#
+#   libmp4v2:installed, --with-mp4v2:  faac uses external libmp4v2
+#   libmp4v2:not installed, --with-mp4v2:  faac uses internal libmp4v2
+#   libmp4v2:installed, --without-mp4v2:  faac uses external libmp4v2
+#   libmp4v2:not installed, --without-mp4v2:  faac doesn't use any libmp4v2
+#
+# 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.
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+mv $PRGNAM $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# Generate configure script
+./bootstrap
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --enable-shared=yes \
+  --enable-static=no \
+  --without-mp4v2 \
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+if [ -d $PKG/usr/man ]; then
+  (   cd $PKG/usr/man
+    find . -type f -exec gzip -9 {} \;
+    for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+  )
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO docs/* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
+
+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
diff --git a/multimedia/faac/faac.info b/audio/faac/faac.info
index 8c988ab660..4a0e214db2 100644
--- a/multimedia/faac/faac.info
+++ b/audio/faac/faac.info
@@ -3,6 +3,6 @@ VERSION="1.26"
 HOMEPAGE="http://sourceforge.net/projects/faac"
 DOWNLOAD="http://downloads.sourceforge.net/faac/faac-1.26.tar.gz"
 MD5SUM="1d7c019bd2dbb4f3101b8937ebc59cf6"
-MAINTAINER="core"
-EMAIL="eroc@linuxmail.org"
+MAINTAINER="Antonio Hernández Blas"
+EMAIL="hba.nihilismus@gmail.com"
 APPROVED="rworkman"
diff --git a/multimedia/faac/slack-desc b/audio/faac/slack-desc
index 353e0382da..353e0382da 100644
--- a/multimedia/faac/slack-desc
+++ b/audio/faac/slack-desc
diff --git a/multimedia/faac/README b/multimedia/faac/README
deleted file mode 100644
index 0c8eb5e41d..0000000000
--- a/multimedia/faac/README
+++ /dev/null
@@ -1,5 +0,0 @@
-faac - Freeware Advanced Audio Coder
-
-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.
diff --git a/multimedia/faac/faac.SlackBuild b/multimedia/faac/faac.SlackBuild
deleted file mode 100644
index b69bbad416..0000000000
--- a/multimedia/faac/faac.SlackBuild
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for faac 
-# Written by core (eroc@linuxmail.org)
-
-# Mofified for version 1.26 by Robby Workman
-# Thanks to Carpo on LinuxQuestions.org for the tips
-
-set -e
-
-PRGNAM=faac
-VERSION=1.26
-ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
-mv $PRGNAM $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
-
-# Generate configure script
-./bootstrap
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --mandir=/usr/man \
-  --enable-shared=yes \
-  --enable-static=no \
-  --with-mp4v2
-
-make
-make install-strip DESTDIR=$PKG
-
-if [ -d $PKG/usr/man ]; then
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
-fi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO docs/* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
-
-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