From 58bcd2cfb71bd734c463d82e94bba77226691b43 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Mon, 16 Mar 2015 20:55:24 +0200 Subject: pulseaudio: move client.conf to libpulse This fixes a scenario where the system has libpulse installed but not pulseaudio-server. The "breakage" didn't have any big practical effects, though, because the default client.conf contains only comments anyway. Signed-off-by: Tanu Kaskinen Signed-off-by: Ross Burton --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 3569752974..501dcfb880 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -85,7 +85,11 @@ PACKAGES_DYNAMIC += "^pulseaudio-lib-.* ^pulseaudio-module-.*" FILES_libpulsecore = "${libdir}/libpulsecore*.so" FILES_libpulsecommon = "${libdir}/pulseaudio/libpulsecommon*.so" -FILES_libpulse = "${libdir}/libpulse.so.*" + +# client.conf configures the behaviour of libpulse, so it belongs in the same +# package. +FILES_libpulse = "${libdir}/libpulse.so.* ${sysconfdir}/pulse/client.conf" + FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*" FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" @@ -104,10 +108,11 @@ FILES_${PN}-misc = "${bindir}/* ${libdir}/pulseaudio/libpulsedsp.so" # Allow the pulseaudio package to be created empty as a placeholder (-dbg and -dev depend on it) ALLOW_EMPTY_${PN} = "1" +CONFFILES_libpulse = "${sysconfdir}/pulse/client.conf" + CONFFILES_pulseaudio-server = "\ ${sysconfdir}/pulse/default.pa \ ${sysconfdir}/pulse/daemon.conf \ - ${sysconfdir}/pulse/client.conf \ " pkg_postinst_${PN}-server() { -- cgit 1.2.3-korg