diff options
9 files changed, 38 insertions, 52 deletions
diff --git a/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb b/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb index 29751d9b9..93f02c845 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 666ed34ad..000000000 --- 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 <ltdl.h>]) -+ - 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 cbd82eeb8..000000000 --- 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 <ltdl.h>]) -+AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>]) - - 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.15/autoconf_version.patch index a3bc3c43c..7a0759da1 100644 --- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/autoconf_version.patch +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/autoconf_version.patch @@ -1,13 +1,13 @@ -Index: pulseaudio-0.9.12/configure.ac +Index: pulseaudio-0.9.15/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 +--- 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.62) +-AC_PREREQ(2.63) +AC_PREREQ(2.61) - m4_define(PA_MAJOR, [0]) - m4_define(PA_MINOR, [9]) + 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.15/buildfix.patch index ca01e0d80..ca01e0d80 100644 --- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/buildfix.patch +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/buildfix.patch diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/gcc4-compile-fix.patch index 34ad026e4..34ad026e4 100644 --- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/gcc4-compile-fix.patch diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/volatiles.04_pulse index 5b1998032..5b1998032 100644 --- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/volatiles.04_pulse diff --git a/meta-moblin/packages/pulseaudio/pulseaudio.inc b/meta-moblin/packages/pulseaudio/pulseaudio.inc index 10ed8e26e..7944095e4 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.15.bb index 8c8feb1ad..14485901e 100644 --- a/meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb +++ b/meta-moblin/packages/pulseaudio/pulseaudio_0.9.15.bb @@ -1,14 +1,12 @@ require pulseaudio.inc DEPENDS += "dbus gdbm speex" -PR = "r1" +PR = "r6" 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} |