From e852b8ef3749e92181e0d899fef93cb86171c471 Mon Sep 17 00:00:00 2001
From: Heinz Wiesinger
Date: Thu, 13 May 2010 00:20:45 +0200
Subject: audio/amrnb: Updated for version 7.0.0.2

---
 audio/amrnb/README           |  7 -------
 audio/amrnb/amrnb.SlackBuild | 20 +++++++-------------
 audio/amrnb/amrnb.info       |  8 ++++++--
 3 files changed, 13 insertions(+), 22 deletions(-)

(limited to 'audio/amrnb')

diff --git a/audio/amrnb/README b/audio/amrnb/README
index 4a02783209..82c50b85e5 100644
--- a/audio/amrnb/README
+++ b/audio/amrnb/README
@@ -6,10 +6,3 @@ when recording video or speech, for example.
 
 The library itself is actually just a wrapper around the original
 code released by 3GPP.
-
-You will need to get the 26104-700.zip file and place it in the same
-directory as the SlackBuild script *before* attempting to build this.
-See the following page for more information:
-  http://www.3gpp.org/ftp/Specs/html-info/26104.htm
-A direct link to the zip file is here:
-  http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-700.zip
diff --git a/audio/amrnb/amrnb.SlackBuild b/audio/amrnb/amrnb.SlackBuild
index 0ad2e5be04..fef09ec972 100644
--- a/audio/amrnb/amrnb.SlackBuild
+++ b/audio/amrnb/amrnb.SlackBuild
@@ -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
@@ -49,6 +52,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
+cp $CWD/26104-700.zip .
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -56,22 +60,12 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --enable-shared \
   --disable-static \
   --localstatedir=/var \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux
-
-if [ -e $CWD/26104-700.zip ]; then
-  cp $CWD/26104-700.zip .
-else
-  echo
-  echo "$CWD/26104-700.zip was not found."
-  echo "Go back and read $CWD/README again."
-  echo
-  exit 1
-fi
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -85,4 +79,4 @@ 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}
diff --git a/audio/amrnb/amrnb.info b/audio/amrnb/amrnb.info
index c9830c9869..50704c3927 100644
--- a/audio/amrnb/amrnb.info
+++ b/audio/amrnb/amrnb.info
@@ -1,8 +1,12 @@
 PRGNAM="amrnb"
 VERSION="7.0.0.2"
 HOMEPAGE="http://www.penguin.cz/~utx/amr"
-DOWNLOAD="http://ftp.penguin.cz/pub/users/utx/amr/amrnb-7.0.0.2.tar.bz2"
-MD5SUM="ab3476a0a058c8f2bf026d484fc8a597"
+DOWNLOAD="http://ftp.penguin.cz/pub/users/utx/amr/amrnb-7.0.0.2.tar.bz2 \
+  http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-700.zip"
+MD5SUM="ab3476a0a058c8f2bf026d484fc8a597 \
+  e8cedb8d502294ab7833ced0b407d238"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="ppr:kut"
 EMAIL="HMWiesinger@gmx.at"
 APPROVED="rworkman"
-- 
cgit v1.2.3