diff --git a/meta-openmoko/packages/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch b/meta-moblin/packages/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch
similarity index 100%
rename from meta-openmoko/packages/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch
rename to meta-moblin/packages/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch
diff --git a/meta-openmoko/packages/pulseaudio/libatomics-ops_1.2.bb b/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb
similarity index 100%
rename from meta-openmoko/packages/pulseaudio/libatomics-ops_1.2.bb
rename to meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb
diff --git a/meta-moblin/packages/pulseaudio/libcanberra/autoconf_version.patch b/meta-moblin/packages/pulseaudio/libcanberra/autoconf_version.patch
new file mode 100644
index 0000000000..73a2ea6e49
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/libcanberra/autoconf_version.patch
@@ -0,0 +1,38 @@
+Allow a slightly older autoconf and disable the inbuild libltdl
+
+RP - 16/4/09
+
+Index: libcanberra-0.10/Makefile.am
+===================================================================
+--- libcanberra-0.10.orig/Makefile.am 2009-04-16 14:38:53.000000000 +0100
++++ libcanberra-0.10/Makefile.am 2009-04-16 14:39:04.000000000 +0100
+@@ -19,7 +19,7 @@
+ dist_doc_DATA = README
+
+ EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas
+-SUBDIRS = src gtkdoc libltdl doc
++SUBDIRS = src gtkdoc doc
+
+ MAINTAINERCLEANFILES = README
+ noinst_DATA = README
+Index: libcanberra-0.10/configure.ac
+===================================================================
+--- libcanberra-0.10.orig/configure.ac 2009-04-16 14:32:33.000000000 +0100
++++ libcanberra-0.10/configure.ac 2009-04-16 14:37:50.000000000 +0100
+@@ -19,7 +19,7 @@
+ # License along with libcanberra. If not, see
+ # .
+
+-AC_PREREQ(2.62)
++AC_PREREQ(2.61)
+
+ AC_INIT([libcanberra], 0.10, [mzyvopnaoreen (at) 0pointer (dot) de])
+ AC_CONFIG_SRCDIR([src/common.c])
+@@ -70,7 +70,6 @@
+ AC_PROG_LIBTOOL
+ AC_SUBST(LTDLINCL)
+ AC_SUBST(LIBLTDL)
+-AC_CONFIG_SUBDIRS(libltdl)
+
+ #### Determine build environment ####
+
diff --git a/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb b/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb
new file mode 100644
index 0000000000..ad44b0f1ab
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops."
+LICENSE = "LGPL"
+DEPENDS = "gtk+ pulseaudio alsa-lib"
+PR = "r1"
+
+inherit gconf autotools
+
+SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \
+ file://autoconf_version.patch;patch=1"
+
+EXTRA_OECONF = " --disable-oss "
+
+do_configure_prepend () {
+ rm -f ${S}/libltdl/configure*
+}
+
+FILES_${PN} += "${libdir}/gtk-2.0/modules/ ${datadir}/gnome"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+ autotools_stage_all
+}
+
+
+
+
diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2113.diff b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff
similarity index 100%
rename from meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2113.diff
rename to meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff
diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2114.diff b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff
similarity index 100%
rename from meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2114.diff
rename to meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/autoconf_version.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/autoconf_version.patch
new file mode 100644
index 0000000000..a3bc3c43c5
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/autoconf_version.patch
@@ -0,0 +1,13 @@
+Index: pulseaudio-0.9.12/configure.ac
+===================================================================
+--- pulseaudio-0.9.12.orig/configure.ac 2009-04-16 14:52:38.000000000 +0100
++++ pulseaudio-0.9.12/configure.ac 2009-04-16 14:52:46.000000000 +0100
+@@ -20,7 +20,7 @@
+ # along with PulseAudio; if not, write to the Free Software Foundation,
+ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+-AC_PREREQ(2.62)
++AC_PREREQ(2.61)
+
+ m4_define(PA_MAJOR, [0])
+ m4_define(PA_MINOR, [9])
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/buildfix.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/buildfix.patch
new file mode 100644
index 0000000000..ca01e0d80f
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/buildfix.patch
@@ -0,0 +1,13 @@
+Index: pulseaudio-0.9.11/src/pulsecore/atomic.h
+===================================================================
+--- pulseaudio-0.9.11.orig/src/pulsecore/atomic.h
++++ pulseaudio-0.9.11/src/pulsecore/atomic.h
+@@ -40,6 +40,8 @@
+ #error "Please include config.h before including this file!"
+ #endif
+
++#include "macro.h"
++
+ #ifdef HAVE_ATOMIC_BUILTINS
+
+ /* __sync based implementation */
diff --git a/meta-openmoko/packages/pulseaudio/files/gcc4-compile-fix.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch
similarity index 100%
rename from meta-openmoko/packages/pulseaudio/files/gcc4-compile-fix.patch
rename to meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch
diff --git a/meta-openmoko/packages/pulseaudio/files/volatiles.04_pulse b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse
similarity index 100%
rename from meta-openmoko/packages/pulseaudio/files/volatiles.04_pulse
rename to meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse
diff --git a/meta-openmoko/packages/pulseaudio/pulse.inc b/meta-moblin/packages/pulseaudio/pulseaudio.inc
similarity index 100%
rename from meta-openmoko/packages/pulseaudio/pulse.inc
rename to meta-moblin/packages/pulseaudio/pulseaudio.inc
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb b/meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb
new file mode 100644
index 0000000000..6ef6669955
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb
@@ -0,0 +1,17 @@
+require pulseaudio.inc
+
+DEPENDS += "dbus gdbm speex"
+PR = "r0"
+
+SRC_URI += "\
+ file://buildfix.patch;patch=1 \
+ file://autoconf_version.patch;patch=1 \
+ file://2113.diff;patch=1;pnum=0 \
+ file://2114.diff;patch=1;pnum=0 \
+"
+
+do_compile_prepend() {
+ cd ${S}
+ mkdir -p ${S}/libltdl
+ cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl
+}
diff --git a/meta-openmoko/packages/pulseaudio/files/disable-using-glibc-tls.patch b/meta-openmoko/packages/pulseaudio/files/disable-using-glibc-tls.patch
deleted file mode 100644
index 31d147be7d..0000000000
--- a/meta-openmoko/packages/pulseaudio/files/disable-using-glibc-tls.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: pulseaudio-0.9.9/configure.ac
-===================================================================
---- pulseaudio-0.9.9.orig/configure.ac 2008-01-24 01:06:06.000000000 +0000
-+++ pulseaudio-0.9.9/configure.ac 2008-02-05 17:45:59.000000000 +0000
-@@ -139,8 +139,8 @@
- ret=$?
- rm -f conftest.o conftest
- if test $ret -eq 0 ; then
-- AC_DEFINE([HAVE_TLS_BUILTIN], 1, [Have __thread().])
-- AC_MSG_RESULT([yes])
-+dnl AC_DEFINE([HAVE_TLS_BUILTIN], 1, [Have __thread().])
-+ AC_MSG_RESULT([no])
- else
- AC_MSG_RESULT([no])
- fi
-@@ -325,8 +325,7 @@
- rm -f conftest.o conftest
-
- if test $ret -eq 0 ; then
-- AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.])
-- AC_MSG_RESULT([yes])
-+ AC_MSG_RESULT([no])
- else
- AC_MSG_RESULT([no])
- fi
diff --git a/meta-openmoko/packages/pulseaudio/files/fix-dbus-without-hal.patch b/meta-openmoko/packages/pulseaudio/files/fix-dbus-without-hal.patch
deleted file mode 100644
index f8ac5674a6..0000000000
--- a/meta-openmoko/packages/pulseaudio/files/fix-dbus-without-hal.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: pulseaudio-0.9.8/src/Makefile.am
-===================================================================
---- pulseaudio-0.9.8.orig/src/Makefile.am
-+++ pulseaudio-0.9.8/src/Makefile.am
-@@ -1424,8 +1424,8 @@
- # HAL
- libdbus_util_la_SOURCES = modules/dbus-util.c modules/dbus-util.h
- libdbus_util_la_LDFLAGS = -avoid-version
--libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) libpulsecore.la
--libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS)
-+libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) $(DBUS_LIBS) libpulsecore.la
-+libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS) $(DBUS_CFLAGS)
-
- module_hal_detect_la_SOURCES = modules/module-hal-detect.c
- module_hal_detect_la_LDFLAGS = -module -avoid-version
diff --git a/meta-openmoko/packages/pulseaudio/files/fix-shm.patch b/meta-openmoko/packages/pulseaudio/files/fix-shm.patch
deleted file mode 100644
index 3bf61d0d34..0000000000
--- a/meta-openmoko/packages/pulseaudio/files/fix-shm.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# fixes building against uclibc
-# fixed upstream, see http://www.pulseaudio.org/ticket/200
-Index: pulseaudio-0.9.9/src/pulsecore/shm.c
-===================================================================
---- pulseaudio-0.9.9/src/pulsecore/shm.c (revision 1971)
-+++ pulseaudio-0.9.9/src/pulsecore/shm.c (revision 2110)
-@@ -319,4 +319,5 @@
- int pa_shm_cleanup(void) {
-
-+#ifdef HAVE_SHM_OPEN
- #ifdef SHM_PATH
- DIR *d;
-@@ -376,5 +377,6 @@
-
- closedir(d);
--#endif
-+#endif /* SHM_PATH */
-+#endif /* HAVE_SHM_OPEN */
-
- return 0;
diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch
deleted file mode 100644
index 4234af5f53..0000000000
--- a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-upstream: http://pulseaudio.org/ticket/287
-
-Index: pulseaudio-0.9.10/src/Makefile.am
-===================================================================
---- pulseaudio-0.9.10.orig/src/Makefile.am 2008-03-30 03:43:05.000000000 +0200
-+++ pulseaudio-0.9.10/src/Makefile.am 2008-05-03 11:55:46.000000000 +0200
-@@ -605,7 +605,7 @@
-
- libpulsedsp_la_SOURCES = utils/padsp.c
- libpulsedsp_la_CFLAGS = $(AM_CFLAGS)
--libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la
-+libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecore.la
- libpulsedsp_la_LDFLAGS = -avoid-version
-
- ###################################
-@@ -888,7 +888,7 @@
-
- libpstream_util_la_SOURCES = pulsecore/pstream-util.c pulsecore/pstream-util.h
- libpstream_util_la_LDFLAGS = -avoid-version
--libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la
-+libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la libpulsecore.la
-
- libpdispatch_la_SOURCES = pulsecore/pdispatch.c pulsecore/pdispatch.h
- libpdispatch_la_LDFLAGS = -avoid-version
diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch
deleted file mode 100644
index 9e9e5f55d3..0000000000
--- a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Tell where is libltdl from libtool - was needed to get it built with libtool 2.2.4
-
----
- configure.ac | 26 +++++++++++++++++++-------
- 1 file changed, 19 insertions(+), 7 deletions(-)
-
---- pulseaudio-0.9.10.orig/configure.ac
-+++ pulseaudio-0.9.10/configure.ac
-@@ -242,20 +242,32 @@ if test $ret -eq 0 ; then
- else
- AC_MSG_RESULT([no])
- fi
-
- #### libtool stuff ####
--
--AC_LTDL_ENABLE_INSTALL
--AC_LIBLTDL_INSTALLABLE
--AC_LIBTOOL_DLOPEN
--AC_LIBTOOL_WIN32_DLL
-+LT_PREREQ([2.2])
-+LT_INIT([dlopen win32-dll])
- AC_PROG_LIBTOOL
--AC_SUBST(LTDLINCL)
--AC_SUBST(LIBLTDL)
-+#AC_SUBST(LTDLINCL)
-+#AC_SUBST(LIBLTDL)
- AC_CONFIG_SUBDIRS(libltdl)
-
-+AC_ARG_WITH(libltdl-libs,
-+ [ --with-libltdl-libs=DIR path to libltdl libs], libltdl_libs_prefix=$withval)
-+if test x$libltdl_libs_prefix != x; then
-+ LIBLTDL="-L${libltdl_libs_prefix}/libltdl.so -lltdl"
-+fi
-+AC_SUBST(LIBLTDL)
-+
-+AC_ARG_WITH(libltdl-includes,
-+ [ --with-libltdl-includes=DIR path to libltdl includes], libltdl_prefix=$withval)
-+if test x$libltdl_prefix != x; then
-+ LTDLINCL="-I${libltdl_prefix} ${libltdl_libs_prefix}/libltdl.so"
-+fi
-+AC_SUBST(LTDLINCL)
-+
-+
- old_LIBS=$LIBS
- LIBS="$LIBS $LIBLTDL"
- AC_CHECK_FUNCS([lt_dlmutex_register])
- LIBS=$old_LIBS
- AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include ])
diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch
deleted file mode 100644
index 74ea6ac060..0000000000
--- a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-upstream: http://pulseaudio.org/changeset/2213
-
-Index: pulseaudio-0.9.10/src/daemon/caps.c
-===================================================================
---- pulseaudio-0.9.10.orig/src/daemon/caps.c 2008-05-03 12:10:26.000000000 +0200
-+++ pulseaudio-0.9.10/src/daemon/caps.c 2008-05-03 12:10:30.000000000 +0200
-@@ -131,9 +131,8 @@
- return 0;
- }
-
--int pa_drop_caps(void) {
-+void pa_drop_caps(void) {
- pa_drop_root();
-- return 0;
- }
-
- #endif
diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio_0.9.10.bb b/meta-openmoko/packages/pulseaudio/pulseaudio_0.9.10.bb
deleted file mode 100644
index 671fb66a96..0000000000
--- a/meta-openmoko/packages/pulseaudio/pulseaudio_0.9.10.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require pulse.inc
-
-DEPENDS += "dbus"
-PR = "r2"
-
-# this is not correct (see below)
-SRC_URI += "\
- file://disable-using-glibc-tls.patch;patch=1 \
- file://libpulsedsp-references-libpulsecore.patch;patch=1 \
- file://pa-drop-caps-returns-void.patch;patch=1 \
- file://2113.diff;patch=1;pnum=0 \
- file://2114.diff;patch=1;pnum=0 \
- file://libtool2.patch;patch=1 \
-"
-
-EXTRA_OECONF += "--with-libltdl-includes=${STAGING_INCDIR}/libltdl/ --with-libltdl-libs=${STAGING_LIBDIR}"
-
-# problems w/ pulseaudio 0.9.10 atm:
-# 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime)
-# 2.) doesn't build w/ glibc TLS support (hence patched out)
-# 3.) fails with hierarchical pthread stuff w/ gst-pulse (hence patched out)