summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/pulseaudio
diff options
context:
space:
mode:
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, 5 insertions, 4 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 753b013cd4..3003eaa3ac 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -27,7 +27,7 @@ EXTRA_OECONF = "\
27 --disable-lynx \ 27 --disable-lynx \
28 ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \ 28 ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \
29 --disable-polkit \ 29 --disable-polkit \
30 ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)} \ 30 ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-x11', '--disable-x11 --disable-gtk2', d)} \
31 --without-jack \ 31 --without-jack \
32 --with-glib \ 32 --with-glib \
33 --with-alsa \ 33 --with-alsa \
@@ -117,7 +117,6 @@ python populate_packages_prepend() {
117 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' ) 117 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' )
118} 118}
119 119
120RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"
121RDEPENDS_pulseaudio-server = " \ 120RDEPENDS_pulseaudio-server = " \
122 pulseaudio-module-filter-apply \ 121 pulseaudio-module-filter-apply \
123 pulseaudio-module-filter-heuristics \ 122 pulseaudio-module-filter-heuristics \
@@ -137,7 +136,9 @@ RDEPENDS_pulseaudio-server = " \
137 pulseaudio-module-rescue-streams \ 136 pulseaudio-module-rescue-streams \
138 pulseaudio-module-always-sink \ 137 pulseaudio-module-always-sink \
139 pulseaudio-module-suspend-on-idle \ 138 pulseaudio-module-suspend-on-idle \
140 pulseaudio-module-console-kit \
141 pulseaudio-module-position-event-sounds \ 139 pulseaudio-module-position-event-sounds \
142 pulseaudio-module-role-cork " 140 pulseaudio-module-role-cork "
143 141
142RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"
143RDEPENDS_pulseaudio-server += "\
144 ${@base_contains('DISTRO_FEATURES', 'x11', 'pulseaudio-module-console-kit', '', d)}"
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
index 947aa6ded6..1c2c9f7976 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 = "r5" 3PR = "r6"
4 4
5DEPENDS += "libjson gdbm speex libxml-parser-perl-native" 5DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
6 6