merge of 42b169fabe3df723d70a1502561f5848f1287a98

     and a7038c05fef716879570b18652c839a87a2a65f8

5 files changed, 61 insertions, 4 deletions

diff --git a/packages/linux/linux-openzaurus_2.6.14-rc1-mm1.bb b/packages/linux/linux-openzaurus_2.6.14-rc1-mm1.bb
index a11db4d307..c266d8bf03 100644
--- a/packages/linux/linux-openzaurus_2.6.14-rc1-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.14-rc1-mm1.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -38,6 +38,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${RPSRC}/pxa_ohci_platform-r1.patch;patch=1 \
            ${RPSRC}/pxa_ohci_suspend-r0.patch;patch=1 \	   
            ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \
+           ${RPSRC}/ide_not_removable-r0.patch;patch=1 \
            ${RPSRC}/corgi_pm-r3.patch;patch=1 \
            ${RPSRC}/spitz_base_extras-r2.patch;patch=1 \
            ${RPSRC}/spitz_pm-r3.patch;patch=1 \
@@ -71,7 +72,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${DOSRC}/tosa-irda-r3.patch;patch=1 \
            ${DOSRC}/tosa-lcd-r3.patch;patch=1 \
            ${RPSRC}/temp/tosa-bl-r7.patch;patch=1 \
-           ${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \
+           ${RPSRC}/pcmcia_dev_ids-r2.patch;patch=1 \
            ${RPSRC}/mmc_timeout-r0.patch;patch=1 \	   
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
            file://add-oz-release-string.patch;patch=1 \
diff --git a/packages/linux/linux-openzaurus_2.6.14-rc1.bb b/packages/linux/linux-openzaurus_2.6.14-rc1.bb
index 28643b8142..3b374340cc 100644
--- a/packages/linux/linux-openzaurus_2.6.14-rc1.bb
+++ b/packages/linux/linux-openzaurus_2.6.14-rc1.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r1"
+PR = "r2"
 
 # Handy URLs
 # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \
@@ -27,6 +27,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${RPSRC}/poodle_cleanup-r0.patch;patch=1 \
            ${RPSRC}/poodle_mmc-r0.patch;patch=1 \
            ${RPSRC}/poodle_irda-r0.patch;patch=1 \
+           ${RPSRC}/ide_not_removable-r0.patch;patch=1 \
            ${RPSRC}/scoop_collie_fix-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \
            ${RPSRC}/corgi_pm-r3.patch;patch=1 \
@@ -62,7 +63,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${DOSRC}/tosa-irda-r3.patch;patch=1 \
            ${DOSRC}/tosa-lcd-r3.patch;patch=1 \
            ${RPSRC}/temp/tosa-bl-r5a.patch;patch=1 \
-           ${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \
+           ${RPSRC}/pcmcia_dev_ids-r2.patch;patch=1 \
            ${RPSRC}/mmc_timeout-r0.patch;patch=1 \	   
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
            file://add-oz-release-string.patch;patch=1 \
diff --git a/packages/rtaudio/.mtn2git_empty b/packages/rtaudio/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/rtaudio/.mtn2git_empty
diff --git a/packages/rtaudio/librtaudio_3.0.1.bb b/packages/rtaudio/librtaudio_3.0.1.bb
new file mode 100644
index 0000000000..62ed46860b
--- /dev/null
+++ b/packages/rtaudio/librtaudio_3.0.1.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "RtAudio is a set of C++ classes which provide a common API \
+for realtime audio input/output across Linux (native ALSA, JACK, and OSS), \
+Macintosh OS X, SGI, and Windows (DirectSound and ASIO) operating systems."
+SECTION = "libs"
+LICENSE = "rtaudio"
+HOMEPAGE = "http://www.music.mcgill.ca/~gary/rtaudio"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "alsa-lib"
+PR = "r0"
+
+SRC_URI = "http://music.mcgill.ca/~gary/rtaudio/release/rtaudio-${PV}.tar.gz"
+S = "${WORKDIR}/rtaudio-${PV}"
+
+inherit qmake qt3x11
+
+do_configure_prepend() {
+	qmake -project -t lib -nopwd *.cpp *.h
+}
+
+EXTRA_QMAKEVARS_POST = "CONFIG=console CONFIG+=thread DEFINES+=__LINUX_OSS__ DEFINES+=__LINUX_ALSA__ LIBS+=-lasound"
+
+do_stage() {
+	install -m 0644 *.h ${STAGING_INCDIR}
+	oe_libinstall -so librtaudio-3.0.1 ${STAGING_LIBDIR}
+}
+
+do_install() {
+	oe_libinstall -so librtaudio-3.0.1 ${D}${libdir}
+}
diff --git a/packages/rtaudio/rtaudio-tests_3.0.1.bb b/packages/rtaudio/rtaudio-tests_3.0.1.bb
new file mode 100644
index 0000000000..53752b73c0
--- /dev/null
+++ b/packages/rtaudio/rtaudio-tests_3.0.1.bb
@@ -0,0 +1,26 @@
+include librtaudio_${PV}.bb
+
+inherit autotools
+
+EXTRA_OECONF = "--with-alsa --with-oss"
+EXTRA_OEMAKE = "-e"
+export CC = "${CXX}"
+CFLAGS += "-I${S}"
+export LIBRARY = "-lasound -lpthread ${LDFLAGS}"
+
+do_compile() {
+	oe_runmake -C tests
+}
+
+do_stage() {
+	:
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	for binary in `find tests -perm 0755 -type f`
+	do
+		install -m 0755 $binary ${D}${bindir}
+        done
+}
+