[oe-commits] Tanu Kaskinen : pulseaudio: move client.conf to libpulse

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: ac32f746ea21dd95f61792d386089b8c621a0f32
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ac32f746ea21dd95f61792d386089b8c621a0f32

Author: Tanu Kaskinen <tanu.kaskinen at linux.intel.com>
Date:   Mon Mar 16 20:55:24 2015 +0200

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 <tanu.kaskinen at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 3569752..501dcfb 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() {