diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2011-07-12 13:27:43 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-12 14:45:05 +0100 |
| commit | e9fedfac0d8ff8213a142a7cfab9b83c840aef4f (patch) | |
| tree | 13728f6967bfbadd13c349920e43c3b27dc5f9a2 /meta | |
| parent | 334cd15994eeb47636434a6e802f50b24e5182f3 (diff) | |
| download | openembedded-core-e9fedfac0d8ff8213a142a7cfab9b83c840aef4f.tar.gz openembedded-core-e9fedfac0d8ff8213a142a7cfab9b83c840aef4f.tar.bz2 openembedded-core-e9fedfac0d8ff8213a142a7cfab9b83c840aef4f.zip | |
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.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
4 files changed, 4 insertions, 5 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 = "\ --with-alsa \ --with-oss \ --without-hal \ + --disable-hal \ " PARALLEL_MAKE = "" @@ -108,7 +109,6 @@ python populate_packages_prepend() { } RDEPENDS_pulseaudio-module-console-kit =+ "consolekit" -RDEPENDS_pulseaudio-module-hal-detect =+ "hal" RDEPENDS_pulseaudio-server = " \ pulseaudio-module-device-restore \ pulseaudio-module-stream-restore \ @@ -119,7 +119,6 @@ RDEPENDS_pulseaudio-server = " \ pulseaudio-module-alsa-source \ pulseaudio-module-alsa-card \ pulseaudio-module-native-protocol-unix \ - pulseaudio-module-hal-detect \ pulseaudio-module-default-device-restore \ pulseaudio-module-rescue-streams \ pulseaudio-module-always-sink \ diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.15.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.15.bb index 71e19e9c6a..a46782b6e4 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.15.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.15.bb @@ -1,7 +1,7 @@ require pulseaudio.inc DEPENDS += "dbus gdbm speex" -PR = "r15" +PR = "r16" SRC_URI += "\ file://buildfix.patch;patch=1 \ diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb index 5124bd778f..d03a726605 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb @@ -1,6 +1,6 @@ require pulseaudio.inc -PR = "r2" +PR = "r3" DEPENDS += "gdbm speex" diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb index 4bdc4edf06..9f354ff305 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb @@ -1,6 +1,6 @@ require pulseaudio.inc -PR = "r0" +PR = "r1" DEPENDS += "gdbm speex" |