summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-07-12 13:27:43 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-12 15:00:45 +0100
commit0be4b5b58078878dae525c121eb3be74b32e7ea8 (patch)
tree6bff869a132845f0a49265471a9c429afafb5bf2 /meta/recipes-multimedia/pulseaudio/pulseaudio.inc
parentecb5359832ffa20668bcc39068c0574a72c473a5 (diff)
downloadpoky-0be4b5b58078878dae525c121eb3be74b32e7ea8.tar.gz
pulseaudio: try harder to disable HAL
This disables linking against (lib)hal but enables the udev-hal compat layer so the hal-detect plugin keeps working. The hal-detect plugin is removed from the default dependencies to discourage its usage, but can be installed manually if needed. (From OE-Core rev: e9fedfac0d8ff8213a142a7cfab9b83c840aef4f) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio/pulseaudio.inc')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 12e6ef30ca..979d0a9d0e 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -27,6 +27,7 @@ EXTRA_OECONF = "\
27 --with-alsa \ 27 --with-alsa \
28 --with-oss \ 28 --with-oss \
29 --without-hal \ 29 --without-hal \
30 --disable-hal \
30" 31"
31 32
32PARALLEL_MAKE = "" 33PARALLEL_MAKE = ""
@@ -108,7 +109,6 @@ python populate_packages_prepend() {
108} 109}
109 110
110RDEPENDS_pulseaudio-module-console-kit =+ "consolekit" 111RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"
111RDEPENDS_pulseaudio-module-hal-detect =+ "hal"
112RDEPENDS_pulseaudio-server = " \ 112RDEPENDS_pulseaudio-server = " \
113 pulseaudio-module-device-restore \ 113 pulseaudio-module-device-restore \
114 pulseaudio-module-stream-restore \ 114 pulseaudio-module-stream-restore \
@@ -119,7 +119,6 @@ RDEPENDS_pulseaudio-server = " \
119 pulseaudio-module-alsa-source \ 119 pulseaudio-module-alsa-source \
120 pulseaudio-module-alsa-card \ 120 pulseaudio-module-alsa-card \
121 pulseaudio-module-native-protocol-unix \ 121 pulseaudio-module-native-protocol-unix \
122 pulseaudio-module-hal-detect \
123 pulseaudio-module-default-device-restore \ 122 pulseaudio-module-default-device-restore \
124 pulseaudio-module-rescue-streams \ 123 pulseaudio-module-rescue-streams \
125 pulseaudio-module-always-sink \ 124 pulseaudio-module-always-sink \