aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorTanu Kaskinen <tanu.kaskinen@linux.intel.com>2015-03-16 20:55:24 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-20 11:03:15 +0000
commit58bcd2cfb71bd734c463d82e94bba77226691b43 (patch)
tree81f8b88d0e0f273b576c9b49d41d7846c938588e /meta/recipes-multimedia
parent335effec42099666d0fb433b31981edcb0dae9a0 (diff)
downloadopenembedded-core-contrib-58bcd2cfb71bd734c463d82e94bba77226691b43.tar.gz
openembedded-core-contrib-58bcd2cfb71bd734c463d82e94bba77226691b43.tar.bz2
openembedded-core-contrib-58bcd2cfb71bd734c463d82e94bba77226691b43.zip
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@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc9
1 files changed, 7 insertions, 2 deletions
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() {