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 --- .../packages/pulseaudio/pulseaudio-0.9.12/2113.diff | 19 +++++++++++++++++++ .../packages/pulseaudio/pulseaudio-0.9.12/2114.diff | 15 +++++++++++++++ .../pulseaudio-0.9.12/autoconf_version.patch | 13 +++++++++++++ .../pulseaudio/pulseaudio-0.9.12/buildfix.patch | 13 +++++++++++++ .../pulseaudio-0.9.12/gcc4-compile-fix.patch | 18 ++++++++++++++++++ .../pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse | 2 ++ 6 files changed, 80 insertions(+) create mode 100644 meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff create mode 100644 meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff create mode 100644 meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/autoconf_version.patch create mode 100644 meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/buildfix.patch create mode 100644 meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch create mode 100644 meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse (limited to 'meta-moblin/packages/pulseaudio/pulseaudio-0.9.12') diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff new file mode 100644 index 000000000..666ed34ad --- /dev/null +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff @@ -0,0 +1,19 @@ +from upstream svn r2113 + +Index: configure.ac +=================================================================== +--- configure.ac (wersja 2112) ++++ configure.ac (wersja 2113) +@@ -172,6 +172,12 @@ + AC_SUBST(LIBLTDL) + AC_CONFIG_SUBDIRS(libltdl) + ++old_LIBS=$LIBS ++LIBS="$LIBS $LIBLTDL" ++AC_CHECK_FUNCS([lt_dlmutex_register]) ++LIBS=$old_LIBS ++AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include ]) ++ + if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then + AC_MSG_ERROR([[ + diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff new file mode 100644 index 000000000..cbd82eeb8 --- /dev/null +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff @@ -0,0 +1,15 @@ +from upstream svn r2114 + +Index: configure.ac +=================================================================== +--- configure.ac (wersja 2113) ++++ configure.ac (wersja 2114) +@@ -176,7 +176,7 @@ + LIBS="$LIBS $LIBLTDL" + AC_CHECK_FUNCS([lt_dlmutex_register]) + LIBS=$old_LIBS +-AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include ]) ++AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include ]) + + if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then + AC_MSG_ERROR([[ 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 000000000..a3bc3c43c --- /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 000000000..ca01e0d80 --- /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-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch new file mode 100644 index 000000000..34ad026e4 --- /dev/null +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch @@ -0,0 +1,18 @@ +| 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-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse new file mode 100644 index 000000000..5b1998032 --- /dev/null +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse @@ -0,0 +1,2 @@ +# +d pulse pulse 0755 /var/run/pulse none -- cgit v1.2.3