summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/pulseaudio
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-01-09 17:43:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-11 10:39:09 +0000
commit1e4627ffbbeb8fe62108283c14ac01f6e2e3e98b (patch)
tree1c096f20fac888d4ea626b3906da4d33404a2d28 /meta/recipes-multimedia/pulseaudio
parent5cc53234610a8c079245f36e24cb4faae8d6861e (diff)
downloadpoky-1e4627ffbbeb8fe62108283c14ac01f6e2e3e98b.tar.gz
pulseaudio: fix multilib packaging
The magic multilibisation doesn't quite catch every instance, so replace 'pulseaudio' with ${PN} where needed to ensure the packaging is as intended. (From OE-Core rev: 65de45912facaede0c40a3b881f4e095590ca205) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc10
1 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 6f5f6a411e..bb3064eb9c 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -212,11 +212,9 @@ pkg_postinst_${PN}-server() {
212} 212}
213 213
214python populate_packages_prepend() { 214python populate_packages_prepend() {
215 #d.setVar('PKG_pulseaudio', 'pulseaudio')
216
217 plugindir = d.expand('${libdir}/pulse-${PV}/modules/') 215 plugindir = d.expand('${libdir}/pulse-${PV}/modules/')
218 do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='', prepend=True) 216 do_split_packages(d, plugindir, '^module-(.*)\.so$', '${PN}-module-%s', 'PulseAudio module for %s', extra_depends='', prepend=True)
219 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='', prepend=True) 217 do_split_packages(d, plugindir, '^lib(.*)\.so$', '${PN}-lib-%s', 'PulseAudio library for %s', extra_depends='', prepend=True)
220} 218}
221 219
222RDEPENDS_pulseaudio-server = " \ 220RDEPENDS_pulseaudio-server = " \
@@ -252,8 +250,8 @@ RDEPENDS_pulseaudio-server += "alsa-plugins-pulseaudio-conf"
252RDEPENDS_pulseaudio-module-console-kit =+ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}" 250RDEPENDS_pulseaudio-module-console-kit =+ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}"
253RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix" 251RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix"
254 252
255FILES_pulseaudio-module-gconf += "${libexecdir}/pulse/gconf-helper" 253FILES_${PN}-module-gconf += "${libexecdir}/pulse/gconf-helper"
256FILES_pulseaudio-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" 254FILES_${PN}-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer"
257 255
258# The console-kit module is good to have on X11 systems (it keeps PulseAudio 256# The console-kit module is good to have on X11 systems (it keeps PulseAudio
259# running for the duration of the user login session). The device-manager and 257# running for the duration of the user login session). The device-manager and