libraries/libofa: Miscellaneous cleanups.

This modified the gcc-4.3 patch to include stdio.h
This commit is contained in:
Robby Workman 2010-05-21 01:33:49 -05:00
parent b551bf0bf0
commit 170b31b638
3 changed files with 24 additions and 14 deletions

View file

@ -1,4 +1,2 @@
LibOFA (Library Open Fingerprint Architecture) is an open-source audio LibOFA (Library Open Fingerprint Architecture) is an open-source audio
fingerprint created and provided by MusicIP (http://www.musicip.com) fingerprint created and provided by MusicIP (http://www.musicip.com)
This requires fftw.

View file

@ -1,19 +1,19 @@
diff -ur libofa-0.9.3.orig/examples/example.cpp libofa-0.9.3/examples/example.cpp diff -Nur libofa-0.9.3.orig//examples/example.cpp libofa-0.9.3/examples/example.cpp
--- libofa-0.9.3.orig/examples/example.cpp 2006-05-10 21:05:37.000000000 +0300 --- libofa-0.9.3.orig//examples/example.cpp 2006-05-10 13:05:37.000000000 -0500
+++ libofa-0.9.3/examples/example.cpp 2008-04-16 15:51:49.000000000 +0300 +++ libofa-0.9.3/examples/example.cpp 2010-05-21 00:41:32.566411537 -0500
@@ -9,6 +9,8 @@ @@ -9,6 +9,9 @@
#include "protocol.h" #include "protocol.h"
+#include <string.h> +#include <string.h>
+#include <stdio.h>
+ +
AudioData* loadWaveFile(char *file); AudioData* loadWaveFile(char *file);
AudioData* loadDataUsingLAME(char *file); AudioData* loadDataUsingLAME(char *file);
Vain hakemistossa libofa-0.9.3/examples: example.cpp.orig diff -Nur libofa-0.9.3.orig//examples/protocol.cpp libofa-0.9.3/examples/protocol.cpp
diff -ur libofa-0.9.3.orig/examples/protocol.cpp libofa-0.9.3/examples/protocol.cpp --- libofa-0.9.3.orig//examples/protocol.cpp 2006-05-10 13:05:42.000000000 -0500
--- libofa-0.9.3.orig/examples/protocol.cpp 2006-05-10 21:05:42.000000000 +0300 +++ libofa-0.9.3/examples/protocol.cpp 2010-05-21 00:41:21.948412917 -0500
+++ libofa-0.9.3/examples/protocol.cpp 2008-04-16 15:51:49.000000000 +0300
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
-------------------------------------------------------------------*/ -------------------------------------------------------------------*/
#include <stdio.h> #include <stdio.h>
@ -22,9 +22,9 @@ diff -ur libofa-0.9.3.orig/examples/protocol.cpp libofa-0.9.3/examples/protocol.
#include <string> #include <string>
#include <map> #include <map>
#include <expat.h> #include <expat.h>
diff -ur libofa-0.9.3.orig/lib/signal_op.cpp libofa-0.9.3/lib/signal_op.cpp diff -Nur libofa-0.9.3.orig//lib/signal_op.cpp libofa-0.9.3/lib/signal_op.cpp
--- libofa-0.9.3.orig/lib/signal_op.cpp 2006-05-10 21:01:12.000000000 +0300 --- libofa-0.9.3.orig//lib/signal_op.cpp 2006-05-10 13:01:12.000000000 -0500
+++ libofa-0.9.3/lib/signal_op.cpp 2008-04-16 15:51:49.000000000 +0300 +++ libofa-0.9.3/lib/signal_op.cpp 2010-05-21 00:41:21.948412917 -0500
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
// DATE CREATED: 1/12/06 // DATE CREATED: 1/12/06

View file

@ -4,10 +4,19 @@
PRGNAM=libofa PRGNAM=libofa
VERSION=${VERSION:-0.9.3} VERSION=${VERSION:-0.9.3}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=${TAG:-_SBo} TAG=${TAG:-_SBo}
# 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
CWD=$(pwd) CWD=$(pwd)
TMP=${TMP:-/tmp/SBo} TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM PKG=$TMP/package-$PRGNAM
@ -22,6 +31,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC" SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64" LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
fi fi
set -e set -e