diff options
| author |   dsomero | 2010-05-27 10:03:31 +0200 |
|---|---|---|
| committer |   David Somero | 2010-05-27 12:10:04 +0200 |
| commit | d49ef225aea62c60e83ecf88f73910a54ca9c15b (patch) | |
| tree | 06b19205590560558fdc02c9594c4bc2b7f4d56f /libraries/audiere | |
| parent | f8071fcc567d69eb91bdcbeae53b0867573d8171 (diff) | |
| download | slackbuilds-d49ef225aea62c60e83ecf88f73910a54ca9c15b.tar.gz | |
libraries/audiere: Miscellaneous cleanups and gcc4.4 patch.
Diffstat (limited to 'libraries/audiere')
| -rw-r--r-- | libraries/audiere/audiere.SlackBuild | 18 | ||||
| -rw-r--r-- | libraries/audiere/patches/audiere-1.9.4-gcc44.patch (renamed from libraries/audiere/patches/audiere-1.9.4-gcc43.patch) | 13 |
2 files changed, 28 insertions, 3 deletions
diff --git a/libraries/audiere/audiere.SlackBuild b/libraries/audiere/audiere.SlackBuild index 3324c250d2..7237ace1bd 100644 --- a/libraries/audiere/audiere.SlackBuild +++ b/libraries/audiere/audiere.SlackBuild @@ -6,10 +6,19 @@ PRGNAM=audiere VERSION=${VERSION:-1.9.4} -ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -24,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -41,7 +53,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p1 < $CWD/patches/audiere-1.9.4-gcc43.patch +patch -p1 < $CWD/patches/audiere-1.9.4-gcc44.patch patch -p1 < $CWD/patches/audiere-1.9.4-flac.patch patch -p1 < $CWD/patches/audiere-1.9.4-speex.patch diff --git a/libraries/audiere/patches/audiere-1.9.4-gcc43.patch b/libraries/audiere/patches/audiere-1.9.4-gcc44.patch index 865c820dd2..a2211dce08 100644 --- a/libraries/audiere/patches/audiere-1.9.4-gcc43.patch +++ b/libraries/audiere/patches/audiere-1.9.4-gcc44.patch @@ -28,3 +28,16 @@ diff -Naur audiere/src/debug.h audiere.tpg/src/debug.h namespace audiere { +diff -Naur audiere/src/utility.cpp b/src/utility.cpp +index f49c028..28fefc8 100644 +--- audiere/src/utility.cpp 2004-04-09 09:33:50.000000000 +0000 ++++ audiere.tpg/src/utility.cpp 2008-06-03 17:39:43.000000000 +0000 +@@ -2,7 +2,7 @@ + #pragma warning(disable : 4786) + #endif + +- ++#include <cstdio> + #include <ctype.h> + #include "utility.h" + #include "internal.h" |