diff options
author | Niklas Nille Åkerström | 2010-05-12 17:36:54 +0200 |
---|---|---|
committer | Robby Workman | 2010-05-12 17:36:54 +0200 |
commit | 9159c9d46c0f730bac2cd7ad5c75928911204000 (patch) | |
tree | 06bd98109da1e0fbe0e54d85bc6fd178bbe3ad31 /audio/faad2 | |
parent | 152e479a907f8948f97d3f4a19151c1d79ef197c (diff) | |
download | slackbuilds-9159c9d46c0f730bac2cd7ad5c75928911204000.tar.gz |
audio/faad2: Updated for version 2.7
Diffstat (limited to 'audio/faad2')
-rw-r--r-- | audio/faad2/faad2.SlackBuild | 33 | ||||
-rw-r--r-- | audio/faad2/faad2.info | 8 | ||||
-rw-r--r-- | audio/faad2/main_overflow.diff | 11 | ||||
-rw-r--r-- | audio/faad2/slack-desc | 5 |
4 files changed, 23 insertions, 34 deletions
diff --git a/audio/faad2/faad2.SlackBuild b/audio/faad2/faad2.SlackBuild index 18f98274e5..b9f42d7029 100644 --- a/audio/faad2/faad2.SlackBuild +++ b/audio/faad2/faad2.SlackBuild @@ -23,9 +23,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=faad2 -VERSION=2.6.1 +VERSION=${VERSION:-2.7} ARCH=${ARCH:-i486} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -37,6 +37,8 @@ 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 set -e @@ -45,33 +47,34 @@ 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 +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . chmod -R a-s,u+rw,go+r-w . -# Security patch - possible heap overflow when reading from a -# buffer returned by the decoder library. -patch -p1 < $CWD/main_overflow.diff - -autoreconf -vif CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --with-drm + --with-drm \ + --mandir=/usr/man \ + --enable-shared=yes \ + --enable-static=no \ + --build=$ARCH-slackware-linux make -make install DESTDIR=$PKG +make install-strip DESTDIR=$PKG -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Compress man pages +mv $PKG/usr/man/manm $PKG/usr/man/man1 +rename .man .1 $PKG/usr/man/man1/*.man +( 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 ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO \ +cp -a AUTHORS COPYING ChangeLog 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 -type f -exec chmod 0644 {} \; diff --git a/audio/faad2/faad2.info b/audio/faad2/faad2.info index 5ed0bea44c..a93b5773a7 100644 --- a/audio/faad2/faad2.info +++ b/audio/faad2/faad2.info @@ -1,8 +1,8 @@ PRGNAM="faad2" -VERSION="2.6.1" +VERSION="2.7" HOMEPAGE="http://www.audiocoding.com/" -DOWNLOAD="http://downloads.sourceforge.net/faac/faad2-2.6.1.tar.gz" -MD5SUM="74e92df40c270f216a8305fc87603c8a" -MAINTAINER="Nille Åkerström" +DOWNLOAD="http://downloads.sourceforge.net/faac/faad2-2.7.tar.bz2" +MD5SUM="4c332fa23febc0e4648064685a3d4332" +MAINTAINER="Niklas 'Nille' Åkerström" EMAIL="nille.kungen[AT]gmail.com" APPROVED="rworkman" diff --git a/audio/faad2/main_overflow.diff b/audio/faad2/main_overflow.diff deleted file mode 100644 index b501cd0048..0000000000 --- a/audio/faad2/main_overflow.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- faad2/frontend/main.c.orig 2007-11-01 13:33:29.000000000 +0100 -+++ faad2/frontend/main.c 2008-10-02 00:13:21.000000000 +0200 -@@ -914,6 +914,8 @@ - sample_count = frameInfo.samples; - } else { - sample_count = (unsigned int)(dur * frameInfo.channels); -+ if (sample_count > frameInfo.samples) -+ sample_count = frameInfo.samples; - - if (!useAacLength && !initial && (sampleId < numSamples/2) && (sample_count != frameInfo.samples)) - { diff --git a/audio/faad2/slack-desc b/audio/faad2/slack-desc index 94ac88a26f..54cfc722dc 100644 --- a/audio/faad2/slack-desc +++ b/audio/faad2/slack-desc @@ -13,7 +13,4 @@ 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: + |