summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-10-24 17:37:34 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-27 09:44:56 +0100
commit24807c6bf5a78e9472a6877695fd9d3928ceacdd (patch)
tree4fb15770d8b5f22d6a63fc698ea0f793f18a65c9 /meta
parent8d4b851f5ec50537745574488feb4f5c9104e2b2 (diff)
downloadpoky-24807c6bf5a78e9472a6877695fd9d3928ceacdd.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. (From OE-Core rev: 039170824cb77c1a68ec91d9f4dc1ae12f701b87) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc11
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb2
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 \
65 --groups audio,pulse --gid pulse pulse" 65 --groups audio,pulse --gid pulse pulse"
66 66
67PACKAGES =+ "libpulsecore libpulsecommon libpulsedsp libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib \ 67PACKAGES =+ "libpulsecore libpulsecommon libpulsedsp libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib \
68 pulseaudio-server pulseaudio-misc pulseaudio-gconf-helper" 68 pulseaudio-server pulseaudio-misc"
69 69
70#upgrade path: 70#upgrade path:
71RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf" 71RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"
@@ -86,7 +86,6 @@ FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}
86FILES_${PN}-conf = "${sysconfdir}" 86FILES_${PN}-conf = "${sysconfdir}"
87FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse" 87FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse"
88FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl ${base_libdir}/udev/rules.d/*.rules" 88FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl ${base_libdir}/udev/rules.d/*.rules"
89FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper"
90FILES_${PN}-misc = "${bindir}/*" 89FILES_${PN}-misc = "${bindir}/*"
91 90
92# Allow the pulseaudio package to be created empty as a placeholder (-dbg and -dev depend on it) 91# 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() {
113 #d.setVar('PKG_pulseaudio', 'pulseaudio') 112 #d.setVar('PKG_pulseaudio', 'pulseaudio')
114 113
115 plugindir = d.expand('${libdir}/pulse-${PV}/modules/') 114 plugindir = d.expand('${libdir}/pulse-${PV}/modules/')
116 do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' ) 115 do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='', prepend=True)
117 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' ) 116 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='', prepend=True)
118} 117}
119 118
120RDEPENDS_pulseaudio-server = " \ 119RDEPENDS_pulseaudio-server = " \
@@ -141,5 +140,9 @@ RDEPENDS_pulseaudio-server = " \
141 pulseaudio-module-switch-on-port-available" 140 pulseaudio-module-switch-on-port-available"
142 141
143RDEPENDS_pulseaudio-module-console-kit =+ "consolekit" 142RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"
143
144FILES_pulseaudio-module-gconf += "${libexecdir}/pulse/gconf-helper"
145FILES_pulseaudio-module-bluetooth-proximity += "${libexecdir}/pulse/proximity-helper"
146
144RDEPENDS_pulseaudio-server += "\ 147RDEPENDS_pulseaudio-server += "\
145 ${@base_contains('DISTRO_FEATURES', 'x11', 'pulseaudio-module-console-kit', '', d)}" 148 ${@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 @@
1require pulseaudio.inc 1require pulseaudio.inc
2 2
3PR = "r8" 3PR = "r9"
4 4
5DEPENDS += "libjson gdbm speex libxml-parser-perl-native" 5DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
6 6