diff options
| author | Ross Burton <ross.burton@intel.com> | 2012-10-24 17:37:35 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-27 09:31:36 +0100 |
| commit | 01b9b1edcc82e0c8cb2240359daa5b14d2c0146b (patch) | |
| tree | a2f155609b5f865e4b388438800e873d0463ea1a | |
| parent | 039170824cb77c1a68ec91d9f4dc1ae12f701b87 (diff) | |
| download | openembedded-core-01b9b1edcc82e0c8cb2240359daa5b14d2c0146b.tar.gz openembedded-core-01b9b1edcc82e0c8cb2240359daa5b14d2c0146b.tar.bz2 openembedded-core-01b9b1edcc82e0c8cb2240359daa5b14d2c0146b.zip | |
pulseaudio: fix library packaging
libpulsecommon has moved into libdir/pulse.
libpulsedsp is an internal library for padsp so put that into pulseaudio-misc
along with padsp.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 7 | ||||
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 70b77dafd3..8c19c223e5 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -64,7 +64,7 @@ USERADD_PARAM_pulseaudio-server = "--system --home /var/run/pulse \ --no-create-home --shell /bin/false \ --groups audio,pulse --gid pulse pulse" -PACKAGES =+ "libpulsecore libpulsecommon libpulsedsp libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib \ +PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib \ pulseaudio-server pulseaudio-misc" #upgrade path: @@ -73,8 +73,7 @@ RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf" PACKAGES_DYNAMIC += "^pulseaudio-lib.* ^pulseaudio-module.* ^libpulse-lib.* ^libpulse-module.* " FILES_libpulsecore = "${libdir}/libpulsecore*.so" -FILES_libpulsecommon = "${libdir}/libpulsecommon*.so" -FILES_libpulsedsp = "${libdir}/libpulsedsp*.so" +FILES_libpulsecommon = "${libdir}/pulseaudio/libpulsecommon*.so" FILES_libpulse = "${libdir}/libpulse.so.*" FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*" FILES_libpulse-browse = "${libdir}/libpulse-browse.so.*" @@ -86,7 +85,7 @@ FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir} FILES_${PN}-conf = "${sysconfdir}" FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse" FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl ${base_libdir}/udev/rules.d/*.rules" -FILES_${PN}-misc = "${bindir}/*" +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" diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb index 07410a4a63..6d5eb5fd4b 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb @@ -1,6 +1,6 @@ require pulseaudio.inc -PR = "r9" +PR = "r10" DEPENDS += "libjson gdbm speex libxml-parser-perl-native" |