summaryrefslogtreecommitdiffstats
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 23:55:58 +0000
commitcc7652fb2484ae73ddad1de5162b4944eb7b87c3 (patch)
tree1c4a1ee66f1b804d1bcb681e868e8c8f26791a46 /meta/recipes-multimedia
parent2ab66b85ec09762380e5a060ca0b3469e37340bd (diff)
downloadpoky-cc7652fb2484ae73ddad1de5162b4944eb7b87c3.tar.gz
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. (From OE-Core rev: 58bcd2cfb71bd734c463d82e94bba77226691b43) Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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-.*"
85 85
86FILES_libpulsecore = "${libdir}/libpulsecore*.so" 86FILES_libpulsecore = "${libdir}/libpulsecore*.so"
87FILES_libpulsecommon = "${libdir}/pulseaudio/libpulsecommon*.so" 87FILES_libpulsecommon = "${libdir}/pulseaudio/libpulsecommon*.so"
88FILES_libpulse = "${libdir}/libpulse.so.*" 88
89# client.conf configures the behaviour of libpulse, so it belongs in the same
90# package.
91FILES_libpulse = "${libdir}/libpulse.so.* ${sysconfdir}/pulse/client.conf"
92
89FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*" 93FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*"
90FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" 94FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*"
91 95
@@ -104,10 +108,11 @@ FILES_${PN}-misc = "${bindir}/* ${libdir}/pulseaudio/libpulsedsp.so"
104# Allow the pulseaudio package to be created empty as a placeholder (-dbg and -dev depend on it) 108# Allow the pulseaudio package to be created empty as a placeholder (-dbg and -dev depend on it)
105ALLOW_EMPTY_${PN} = "1" 109ALLOW_EMPTY_${PN} = "1"
106 110
111CONFFILES_libpulse = "${sysconfdir}/pulse/client.conf"
112
107CONFFILES_pulseaudio-server = "\ 113CONFFILES_pulseaudio-server = "\
108 ${sysconfdir}/pulse/default.pa \ 114 ${sysconfdir}/pulse/default.pa \
109 ${sysconfdir}/pulse/daemon.conf \ 115 ${sysconfdir}/pulse/daemon.conf \
110 ${sysconfdir}/pulse/client.conf \
111 " 116 "
112 117
113pkg_postinst_${PN}-server() { 118pkg_postinst_${PN}-server() {