Patchwork [1/2] pulseaudio: try harder to disable HAL

login
register
mail settings
Submitter Koen Kooi
Date July 12, 2011, 11:27 a.m.
Message ID <1310470064-22366-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/7405/
State New, archived
Headers show

Comments

Koen Kooi - July 12, 2011, 11:27 a.m.
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>
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    3 +--
 .../pulseaudio/pulseaudio_0.9.15.bb                |    2 +-
 .../pulseaudio/pulseaudio_0.9.22.bb                |    2 +-
 .../pulseaudio/pulseaudio_0.9.23.bb                |    2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)
Richard Purdie - July 12, 2011, 1:45 p.m.
On Tue, 2011-07-12 at 13:27 +0200, Koen Kooi wrote:
> 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>
> ---
>  meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    3 +--
>  .../pulseaudio/pulseaudio_0.9.15.bb                |    2 +-
>  .../pulseaudio/pulseaudio_0.9.22.bb                |    2 +-
>  .../pulseaudio/pulseaudio_0.9.23.bb                |    2 +-
>  4 files changed, 4 insertions(+), 5 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 12e6ef3..979d0a9 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 71e19e9..a46782b 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 5124bd7..d03a726 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 4bdc4ed..9f354ff 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"