From 5df6deaa32e4f6d0a8985403970a137270491991 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 21 Apr 2009 17:40:55 +0100 Subject: puslseaudio: Upgrade to 0.9.10 Upgrade to 0.9.10, moving pulseaudio to meta-moblin cleaning up and merging in some changes from OE.dev. Also add libcanberra 0.10. Signed-off-by: Richard Purdie --- .../pulseaudio/files/disable-using-glibc-tls.patch | 25 ---------------------- .../pulseaudio/files/fix-dbus-without-hal.patch | 15 ------------- .../packages/pulseaudio/files/fix-shm.patch | 20 ----------------- .../pulseaudio/files/gcc4-compile-fix.patch | 18 ---------------- .../packages/pulseaudio/files/volatiles.04_pulse | 2 -- 5 files changed, 80 deletions(-) delete mode 100644 meta-openmoko/packages/pulseaudio/files/disable-using-glibc-tls.patch delete mode 100644 meta-openmoko/packages/pulseaudio/files/fix-dbus-without-hal.patch delete mode 100644 meta-openmoko/packages/pulseaudio/files/fix-shm.patch delete mode 100644 meta-openmoko/packages/pulseaudio/files/gcc4-compile-fix.patch delete mode 100644 meta-openmoko/packages/pulseaudio/files/volatiles.04_pulse (limited to 'meta-openmoko/packages/pulseaudio/files') 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 31d147be7..000000000 --- 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 f8ac5674a..000000000 --- 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 3bf61d0d3..000000000 --- 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/files/gcc4-compile-fix.patch b/meta-openmoko/packages/pulseaudio/files/gcc4-compile-fix.patch deleted file mode 100644 index 34ad026e4..000000000 --- a/meta-openmoko/packages/pulseaudio/files/gcc4-compile-fix.patch +++ /dev/null @@ -1,18 +0,0 @@ -| fix for more strict syntax compliance in gcc4.x -| pulsecore/core-util.c: In function 'pa_raise_priority': -| pulsecore/core-util.c:547: error: label at end of compound statement -| Signed off: mickey@openmoko.org -| -Index: pulseaudio-0.9.6/src/pulsecore/core-util.c -=================================================================== ---- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c -+++ pulseaudio-0.9.6/src/pulsecore/core-util.c -@@ -535,7 +535,7 @@ void pa_raise_priority(void) { - pa_log_info("Successfully gained high priority class."); - #endif - --fail: -+fail:; - - #if defined(HAVE_SYS_CAPABILITY_H) - if (caps) { diff --git a/meta-openmoko/packages/pulseaudio/files/volatiles.04_pulse b/meta-openmoko/packages/pulseaudio/files/volatiles.04_pulse deleted file mode 100644 index 5b1998032..000000000 --- a/meta-openmoko/packages/pulseaudio/files/volatiles.04_pulse +++ /dev/null @@ -1,2 +0,0 @@ -# -d pulse pulse 0755 /var/run/pulse none -- cgit v1.2.3