From d7568d312b2f697511d225cfa13ecde96a9a6b92 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 22 May 2009 17:29:23 +0100 Subject: pulseaudio: 0.9.12 -> 0.9.15 plus several build/packaging fixes and enabling dbus/consolekit/hal/x functionality Signed-off-by: Richard Purdie --- .../packages/pulseaudio/libcanberra_0.10.bb | 3 +- .../pulseaudio/pulseaudio-0.9.12/2113.diff | 19 ------------ .../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-0.9.12/volatiles.04_pulse | 2 -- .../pulseaudio-0.9.15/autoconf_version.patch | 13 ++++++++ .../pulseaudio/pulseaudio-0.9.15/buildfix.patch | 13 ++++++++ .../pulseaudio-0.9.15/gcc4-compile-fix.patch | 18 +++++++++++ .../pulseaudio-0.9.15/volatiles.04_pulse | 2 ++ meta-moblin/packages/pulseaudio/pulseaudio.inc | 35 +++++++++++++++++----- .../packages/pulseaudio/pulseaudio_0.9.12.bb | 17 ----------- .../packages/pulseaudio/pulseaudio_0.9.15.bb | 15 ++++++++++ 14 files changed, 91 insertions(+), 105 deletions(-) delete mode 100644 meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff delete mode 100644 meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff delete mode 100644 meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/autoconf_version.patch delete mode 100644 meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/buildfix.patch delete mode 100644 meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch delete mode 100644 meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse create mode 100644 meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/autoconf_version.patch create mode 100644 meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/buildfix.patch create mode 100644 meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/gcc4-compile-fix.patch create mode 100644 meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/volatiles.04_pulse delete mode 100644 meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb create mode 100644 meta-moblin/packages/pulseaudio/pulseaudio_0.9.15.bb (limited to 'meta-moblin/packages') diff --git a/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb b/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb index 29751d9b9c..93f02c8459 100644 --- a/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb +++ b/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb @@ -1,11 +1,12 @@ 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 libtool" -PR = "r2" +PR = "r3" inherit gconf autotools SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \ + file://nofallbackfix.patch;patch=1 \ file://autoconf_version.patch;patch=1" EXTRA_OECONF = " --disable-oss --disable-ltdl-install" diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff deleted file mode 100644 index 666ed34ad3..0000000000 --- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index cbd82eeb84..0000000000 --- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index a3bc3c43c5..0000000000 --- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/autoconf_version.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index ca01e0d80f..0000000000 --- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/buildfix.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 34ad026e4d..0000000000 --- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/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-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse deleted file mode 100644 index 5b1998032b..0000000000 --- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse +++ /dev/null @@ -1,2 +0,0 @@ -# -d pulse pulse 0755 /var/run/pulse none diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/autoconf_version.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/autoconf_version.patch new file mode 100644 index 0000000000..7a0759da13 --- /dev/null +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/autoconf_version.patch @@ -0,0 +1,13 @@ +Index: pulseaudio-0.9.15/configure.ac +=================================================================== +--- pulseaudio-0.9.15.orig/configure.ac 2009-04-14 00:09:53.000000000 +0100 ++++ pulseaudio-0.9.15/configure.ac 2009-05-22 11:32:50.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.63) ++AC_PREREQ(2.61) + + m4_define(pa_major, [0]) + m4_define(pa_minor, [9]) diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/buildfix.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/buildfix.patch new file mode 100644 index 0000000000..ca01e0d80f --- /dev/null +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/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.15/gcc4-compile-fix.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/gcc4-compile-fix.patch new file mode 100644 index 0000000000..34ad026e4d --- /dev/null +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/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.15/volatiles.04_pulse b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/volatiles.04_pulse new file mode 100644 index 0000000000..5b1998032b --- /dev/null +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/volatiles.04_pulse @@ -0,0 +1,2 @@ +# +d pulse pulse 0755 /var/run/pulse none diff --git a/meta-moblin/packages/pulseaudio/pulseaudio.inc b/meta-moblin/packages/pulseaudio/pulseaudio.inc index 10ed8e26e9..7944095e46 100644 --- a/meta-moblin/packages/pulseaudio/pulseaudio.inc +++ b/meta-moblin/packages/pulseaudio/pulseaudio.inc @@ -3,9 +3,9 @@ HOMEPAGE = "http://www.pulseaudio.org" AUTHOR = "Lennart Poettering" SECTION = "libs/multimedia" LICENSE = "LGPL" -DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool hal" +DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool hal virtual/libx11" # optional -DEPENDS += "alsa-lib glib-2.0" +DEPENDS += "alsa-lib glib-2.0 dbus consolekit hal" SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ file://gcc4-compile-fix.patch;patch=1 \ @@ -16,7 +16,8 @@ inherit autotools pkgconfig EXTRA_OECONF = "\ --disable-lynx \ --disable-bluez \ - --without-x \ + --disable-polkit \ + --with-x \ --without-jack \ --with-glib \ --with-alsa \ @@ -61,12 +62,12 @@ FILES_libpulse-browse = "${libdir}/libpulse-browse.so.*" FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \ - ${libdir}/pulse-0.9/modules/.debug" -FILES_${PN}-dev += "${libdir}/pulse-0.9/modules/*.la" + ${libdir}/pulse-${PV}/modules/.debug" +FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la" FILES_${PN}-conf = "${sysconfdir}" FILES_${PN}-bin = "${bindir}/* \ ${sysconfdir}/default/volatiles/volatiles.04_pulse" -FILES_${PN}-server = "${bindir}/pulseaudio ${sysconfdir}" +FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir}" FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper" FILES_${PN}-misc = "${bindir}/*" @@ -99,7 +100,27 @@ pkg_postrm_${PN}-server() { python populate_packages_prepend() { #bb.data.setVar('PKG_pulseaudio', 'pulseaudio', d) - plugindir = bb.data.expand('${libdir}/pulse-0.9/modules/', d) + plugindir = bb.data.expand('${libdir}/pulse-${PV}/modules/', d) do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' ) do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' ) } + +RDEPENDS_pulseaudio-module-console-kit =+ "consolekit" +RDEPENDS_pulseaudio-module-hal_detect =+ "hal" +RDEPENDS_pulseaudio-server = " \ + pulseaudio-module-device-restore \ + pulseaudio-module-stream-restore \ + pulseaudio-module-card-restore \ + pulseaudio-module-augment-properties \ + pulseaudio-module-detect \ + pulseaudio-module-alsa-sink \ + pulseaudio-module-alsa-source \ + pulseaudio-module-native-protocol-unix \ + pulseaudio-module-default-device-restore \ + pulseaudio-module-rescue-streams \ + pulseaudio-module-always-sink \ + pulseaudio-module-suspend-on-idle \ + pulseaudio-module-console-kit \ + pulseaudio-module-position-event-sounds \ + pulseaudio-module-cork-music-on-phone " + diff --git a/meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb b/meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb deleted file mode 100644 index 8c8feb1ad1..0000000000 --- a/meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb +++ /dev/null @@ -1,17 +0,0 @@ -require pulseaudio.inc - -DEPENDS += "dbus gdbm speex" -PR = "r1" - -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-moblin/packages/pulseaudio/pulseaudio_0.9.15.bb b/meta-moblin/packages/pulseaudio/pulseaudio_0.9.15.bb new file mode 100644 index 0000000000..14485901e7 --- /dev/null +++ b/meta-moblin/packages/pulseaudio/pulseaudio_0.9.15.bb @@ -0,0 +1,15 @@ +require pulseaudio.inc + +DEPENDS += "dbus gdbm speex" +PR = "r6" + +SRC_URI += "\ + file://buildfix.patch;patch=1 \ + file://autoconf_version.patch;patch=1 \ +" + +do_compile_prepend() { + cd ${S} + mkdir -p ${S}/libltdl + cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl +} -- cgit v1.2.3