summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/pulseaudio
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-10-24 17:37:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-27 09:44:57 +0100
commit6b2db8b388a7e215ef47fa4cb8791d2d6cb873f5 (patch)
tree46846ebdbd4bc5785c3a8cc81ff5284a1177a98b /meta/recipes-multimedia/pulseaudio
parent24807c6bf5a78e9472a6877695fd9d3928ceacdd (diff)
downloadpoky-6b2db8b388a7e215ef47fa4cb8791d2d6cb873f5.tar.gz
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. (From OE-Core rev: 01b9b1edcc82e0c8cb2240359daa5b14d2c0146b) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc7
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb2
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 \
64 --no-create-home --shell /bin/false \ 64 --no-create-home --shell /bin/false \
65 --groups audio,pulse --gid pulse pulse" 65 --groups audio,pulse --gid pulse pulse"
66 66
67PACKAGES =+ "libpulsecore libpulsecommon libpulsedsp libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib \ 67PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib \
68 pulseaudio-server pulseaudio-misc" 68 pulseaudio-server pulseaudio-misc"
69 69
70#upgrade path: 70#upgrade path:
@@ -73,8 +73,7 @@ RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"
73PACKAGES_DYNAMIC += "^pulseaudio-lib.* ^pulseaudio-module.* ^libpulse-lib.* ^libpulse-module.* " 73PACKAGES_DYNAMIC += "^pulseaudio-lib.* ^pulseaudio-module.* ^libpulse-lib.* ^libpulse-module.* "
74 74
75FILES_libpulsecore = "${libdir}/libpulsecore*.so" 75FILES_libpulsecore = "${libdir}/libpulsecore*.so"
76FILES_libpulsecommon = "${libdir}/libpulsecommon*.so" 76FILES_libpulsecommon = "${libdir}/pulseaudio/libpulsecommon*.so"
77FILES_libpulsedsp = "${libdir}/libpulsedsp*.so"
78FILES_libpulse = "${libdir}/libpulse.so.*" 77FILES_libpulse = "${libdir}/libpulse.so.*"
79FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*" 78FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*"
80FILES_libpulse-browse = "${libdir}/libpulse-browse.so.*" 79FILES_libpulse-browse = "${libdir}/libpulse-browse.so.*"
@@ -86,7 +85,7 @@ FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}
86FILES_${PN}-conf = "${sysconfdir}" 85FILES_${PN}-conf = "${sysconfdir}"
87FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse" 86FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse"
88FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl ${base_libdir}/udev/rules.d/*.rules" 87FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl ${base_libdir}/udev/rules.d/*.rules"
89FILES_${PN}-misc = "${bindir}/*" 88FILES_${PN}-misc = "${bindir}/* ${libdir}/pulseaudio/libpulsedsp.so"
90 89
91# Allow the pulseaudio package to be created empty as a placeholder (-dbg and -dev depend on it) 90# Allow the pulseaudio package to be created empty as a placeholder (-dbg and -dev depend on it)
92ALLOW_EMPTY_${PN} = "1" 91ALLOW_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 @@
1require pulseaudio.inc 1require pulseaudio.inc
2 2
3PR = "r9" 3PR = "r10"
4 4
5DEPENDS += "libjson gdbm speex libxml-parser-perl-native" 5DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
6 6