diff options
| -rw-r--r-- | audio/amrwb/README | 7 | ||||
| -rw-r--r-- | audio/amrwb/amrwb.SlackBuild | 17 | ||||
| -rw-r--r-- | audio/amrwb/amrwb.info | 8 |
3 files changed, 12 insertions, 20 deletions
diff --git a/audio/amrwb/README b/audio/amrwb/README index f7a9db7ae5..11329b2bf1 100644 --- a/audio/amrwb/README +++ b/audio/amrwb/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 26204-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/26204.htm -A direct link to the zip file is here: - http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-700.zip diff --git a/audio/amrwb/amrwb.SlackBuild b/audio/amrwb/amrwb.SlackBuild index 88ad6425b9..7c4525d12b 100644 --- a/audio/amrwb/amrwb.SlackBuild +++ b/audio/amrwb/amrwb.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/26204-700.zip . chown -R root:root . chmod -R u+w,go+r-w,a-s . @@ -56,6 +60,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --enable-shared \ --disable-static \ @@ -63,16 +68,6 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux \ --host=$ARCH-slackware-linux -if [ -e $CWD/26204-700.zip ]; then - cp $CWD/26204-700.zip . -else - echo - echo "$CWD/26204-700.zip was not found." - echo "Go back and read $CWD/README again." - echo - exit 1 -fi - make make install-strip DESTDIR=$PKG @@ -85,4 +80,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/amrwb/amrwb.info b/audio/amrwb/amrwb.info index 82efd0ea04..7c75470871 100644 --- a/audio/amrwb/amrwb.info +++ b/audio/amrwb/amrwb.info @@ -1,8 +1,12 @@ PRGNAM="amrwb" VERSION="7.0.0.3" HOMEPAGE="http://www.penguin.cz/~utx/amr" -DOWNLOAD="http://ftp.penguin.cz/pub/users/utx/amr/amrwb-7.0.0.3.tar.bz2" -MD5SUM="5ffbc49146b0bb09b5d7f0ec68de1fe7" +DOWNLOAD="http://ftp.penguin.cz/pub/users/utx/amr/amrwb-7.0.0.3.tar.bz2 \ + http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-700.zip" +MD5SUM="5ffbc49146b0bb09b5d7f0ec68de1fe7 \ + 2e5098687d3007a05b7acc8298a5b072" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="ppr:kut" EMAIL="HMWiesinger@gmx.at" APPROVED="rworkman" |