diff options
Diffstat (limited to 'source/ap/flac')
| -rwxr-xr-x | source/ap/flac/flac.SlackBuild | 27 | ||||
| -rw-r--r-- | source/ap/flac/flac.gcc45.diff | 10 |
2 files changed, 31 insertions, 6 deletions
diff --git a/source/ap/flac/flac.SlackBuild b/source/ap/flac/flac.SlackBuild index 7f2d02d31..4cc97ea58 100755 --- a/source/ap/flac/flac.SlackBuild +++ b/source/ap/flac/flac.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,10 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.2.1 -ARCH=${ARCH:-x86_64} +PKGNAM=flac +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-3} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-2} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -35,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) @@ -46,9 +60,10 @@ mkdir -p $TMP $PKG cd $TMP rm -rf flac-$VERSION -tar xvf $CWD/flac-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/flac-$VERSION.tar.?z* || exit 1 cd flac-$VERSION -zcat $CWD/flac.man.diff.gz | patch -p1 --verbose --backup --suffix=.orig +zcat $CWD/flac.man.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +zcat $CWD/flac.gcc45.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 chown -R root:root . find . \ diff --git a/source/ap/flac/flac.gcc45.diff b/source/ap/flac/flac.gcc45.diff new file mode 100644 index 000000000..a2c241cc9 --- /dev/null +++ b/source/ap/flac/flac.gcc45.diff @@ -0,0 +1,10 @@ +--- ./examples/cpp/encode/file/main.cpp.orig 2007-09-13 10:58:03.000000000 -0500 ++++ ./examples/cpp/encode/file/main.cpp 2011-03-09 14:06:05.329999998 -0600 +@@ -30,6 +30,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <cstring> + #include "FLAC++/metadata.h" + #include "FLAC++/encoder.h" + |