diff options
| author |   Ross Burton <ross.burton@intel.com> | 2012-10-24 17:37:34 +0100 |
|---|---|---|
| committer |   Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2012-11-29 12:00:25 +0100 |
| commit | 96fd1a95adbb4635893a5cba5b37321c9d62d43b (patch) | |
| tree | 23a9f99d831572437d749e03b8000f137d7927ed /meta/recipes-multimedia | |
| parent | 4cff5b9e012bf3272dec6bc627abc00f05a3734c (diff) | |
| download | openembedded-core-contrib-96fd1a95adbb4635893a5cba5b37321c9d62d43b.tar.gz | |
pulseaudio: move helper binaries into the relevant module packages
proximity-helper is only used by the bluetooth-proximity module, and
gconf-helper is only used by the gconf module. Clarify the packaging and clean
up dependencies by shipping the helper binaries with the modules that spawn
them.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-multimedia')
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 11 | ||||
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index ab70c7e9a9..70b77dafd3 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -65,7 +65,7 @@ USERADD_PARAM_pulseaudio-server = "--system --home /var/run/pulse \ --groups audio,pulse --gid pulse pulse" PACKAGES =+ "libpulsecore libpulsecommon libpulsedsp libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib \ - pulseaudio-server pulseaudio-misc pulseaudio-gconf-helper" + pulseaudio-server pulseaudio-misc" #upgrade path: RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf" @@ -86,7 +86,6 @@ FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir} FILES_${PN}-conf = "${sysconfdir}" FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse" FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl ${base_libdir}/udev/rules.d/*.rules" -FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper" FILES_${PN}-misc = "${bindir}/*" # Allow the pulseaudio package to be created empty as a placeholder (-dbg and -dev depend on it) @@ -113,8 +112,8 @@ python populate_packages_prepend() { #d.setVar('PKG_pulseaudio', 'pulseaudio') plugindir = d.expand('${libdir}/pulse-${PV}/modules/') - 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='' ) + do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='', prepend=True) + do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='', prepend=True) } RDEPENDS_pulseaudio-server = " \ @@ -141,5 +140,9 @@ RDEPENDS_pulseaudio-server = " \ pulseaudio-module-switch-on-port-available" RDEPENDS_pulseaudio-module-console-kit =+ "consolekit" + +FILES_pulseaudio-module-gconf += "${libexecdir}/pulse/gconf-helper" +FILES_pulseaudio-module-bluetooth-proximity += "${libexecdir}/pulse/proximity-helper" + RDEPENDS_pulseaudio-server += "\ ${@base_contains('DISTRO_FEATURES', 'x11', 'pulseaudio-module-console-kit', '', d)}" diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb index d25b424214..07410a4a63 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb @@ -1,6 +1,6 @@ require pulseaudio.inc -PR = "r8" +PR = "r9" DEPENDS += "libjson gdbm speex libxml-parser-perl-native" |