diff options
| author | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2015-03-16 20:55:24 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-20 23:55:58 +0000 |
| commit | cc7652fb2484ae73ddad1de5162b4944eb7b87c3 (patch) | |
| tree | 1c4a1ee66f1b804d1bcb681e868e8c8f26791a46 /meta | |
| parent | 2ab66b85ec09762380e5a060ca0b3469e37340bd (diff) | |
| download | ast2050-yocto-poky-cc7652fb2484ae73ddad1de5162b4944eb7b87c3.zip ast2050-yocto-poky-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')
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 9 |
1 files 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() { |
