aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/faad2/faad2.SlackBuild8
-rw-r--r--audio/faad2/faad2.info2
-rw-r--r--audio/faad2/slack-desc5
3 files changed, 12 insertions, 3 deletions
diff --git a/audio/faad2/faad2.SlackBuild b/audio/faad2/faad2.SlackBuild
index b9f42d7029af8..04b40d60483e7 100644
--- a/audio/faad2/faad2.SlackBuild
+++ b/audio/faad2/faad2.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Slackware build script for faad2
-#
+
# Copyright 2007 Niklas "Nille" Åkerström
# All rights reserved.
#
@@ -35,10 +35,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
@@ -56,6 +59,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--with-drm \
--mandir=/usr/man \
--enable-shared=yes \
@@ -83,7 +87,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/faad2/faad2.info b/audio/faad2/faad2.info
index a93b5773a771e..348c32a358001 100644
--- a/audio/faad2/faad2.info
+++ b/audio/faad2/faad2.info
@@ -2,7 +2,9 @@ PRGNAM="faad2"
VERSION="2.7"
HOMEPAGE="http://www.audiocoding.com/"
DOWNLOAD="http://downloads.sourceforge.net/faac/faad2-2.7.tar.bz2"
+DOWNLOAD_x86_64=""
MD5SUM="4c332fa23febc0e4648064685a3d4332"
+MD5SUM_x86_64=""
MAINTAINER="Niklas 'Nille' Åkerström"
EMAIL="nille.kungen[AT]gmail.com"
APPROVED="rworkman"
diff --git a/audio/faad2/slack-desc b/audio/faad2/slack-desc
index 54cfc722dcfe7..94ac88a26f05a 100644
--- a/audio/faad2/slack-desc
+++ b/audio/faad2/slack-desc
@@ -13,4 +13,7 @@ faad2: decoder. Faad2 includes code for SBR (HE AAC) decoding.
faad2:
faad2: http://www.audiocoding.com/
faad2: http://sourceforge.net/projects/faac/
-
+faad2:
+faad2:
+faad2:
+faad2: