Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/

into marcinj.local:/home/hrw/zaurus/bb/openembedded

2005/02/10 11:55:44+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/10 11:55:29+01:00 uni-frankfurt.de!mickeyl
revamp portaudio build system

2005/02/10 10:44:50+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/10 01:28:04+01:00 uni-frankfurt.de!mickeyl
repair portaudio

BKrev: 420b420cWqntwaOMKQguKwkqN6OtMA

3 files changed, 62 insertions, 8 deletions

diff --git a/packages/portaudio/files/flags.patch b/packages/portaudio/files/flags.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/portaudio/files/flags.patch
+++ /dev/null
diff --git a/packages/portaudio/files/no-static-lib.patch b/packages/portaudio/files/no-static-lib.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/portaudio/files/no-static-lib.patch
+++ /dev/null
diff --git a/packages/portaudio/portaudio_0.0.19.bb b/packages/portaudio/portaudio_0.0.19.bb
index c0f9ced49e..00acecddd4 100644
--- a/packages/portaudio/portaudio_0.0.19.bb
+++ b/packages/portaudio/portaudio_0.0.19.bb
@@ -4,16 +4,70 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PV = "v19-cvs-${CVSDATE}"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "http://www.portaudio.com/archives/pa_snapshot_v19.tar.gz \
-	   file://flags.patch;patch=1 \
-	   file://no-static-lib.patch;patch=1"
+SRC_URI = "http://www.portaudio.com/archives/pa_snapshot_v19.tar.gz"
 S = "${WORKDIR}/portaudio"
 
-inherit autotools pkgconfig
+inherit qmake
 
-EXTRA_OECONF = "--with-oss --with-alsa --with-jack=no"
+TESTS = "  pa_devs patest1      patest_hang patest_many                   patest_prime patest_sine patest_stop     patest_write_sine        \
+pa_fuzz    patest_buffer        patest_in_overflow  patest_maxsines       patest_read_record  patest_sine8         patest_sync              \
+pa_minlat  patest_callbackstop  patest_latency      patest_multi_sine     patest_record       patest_sine_formats  patest_toomanysines      \
+paqa_devs  patest_clip          patest_leftright    patest_out_underflow  patest_ringmix      patest_sine_time     patest_underflow         \
+paqa_errs  patest_dither        patest_longsine     patest_pink           patest_saw          patest_start_stop    patest_wire"
+
+do_configure_prepend() {
+    echo "TEMPLATE = subdirs" >portaudio.pro
+    echo "SUBDIRS = lib tests" >>portaudio.pro
+
+    mkdir -p lib
+    cat <<EOF >lib/lib.pro    
+TEMPLATE = lib
+CONFIG = console debug warn_on
+TARGET = portaudio
+VERSION = 0.0.19
+DESTDIR = .
+DEFINES = PA_USE_OSS=1 HAVE_LIBPTHREAD=1
+DEFINES += PA_LITTLE_ENDIAN
+
+INCLUDEPATH = ../pa_common
+
+SOURCES = \
+        ../pa_common/pa_allocation.c \
+        ../pa_common/pa_converters.c \
+        ../pa_common/pa_cpuload.c \
+        ../pa_common/pa_dither.c \
+        ../pa_common/pa_front.c \
+        ../pa_common/pa_process.c \
+        ../pa_common/pa_skeleton.c \
+        ../pa_common/pa_stream.c \
+        ../pa_common/pa_trace.c \
+\
+        ../pa_unix_oss/pa_unix_oss.c \
+        ../pa_unix/pa_unix_hostapis.c \
+        ../pa_unix/pa_unix_util.c
+EOF
+
+    mkdir -p tests
+    echo "TEMPLATE = subdirs" >tests/tests.pro
+    echo "SUBDIRS = \\" >>tests/tests.pro
+    
+    for test in ${TESTS}
+    do
+        mkdir -p tests/$test
+        cat <<EOF >tests/$test/$test.pro
+TEMPLATE = app
+CONFIG = console debug warn_on thread
+DESTDIR = ../../bin
+INCLUDEPATH = ../../pa_common/
+LIBS = -L../../lib -lportaudio -lm
+SOURCES = ../../pa_tests/$test.c
+EOF
+        echo "$test \\" >>tests/tests.pro
+    done
+    echo >>tests/tests.pro
+}
 
 do_stage() {
 	oe_libinstall -so -C lib libportaudio ${STAGING_LIBDIR}
@@ -29,6 +83,6 @@ do_install() {
 	install -m 0755 bin/* ${D}/${bindir}/
 }
 
-PACKAGES = "portaudio portaudio-dev portaudio-examples"
-FILES_${PN} = "${libdir}"
+PACKAGES = "libportaudio0 portaudio-dev portaudio-examples"
+FILES_libportaudio0 = "${libdir}"
 FILES_portaudio-examples = "${bindir}"