Patchwork pulseaudio: ensure X11 and consolekit are disabled

login
mail settings
Submitter Saul Wold
Date Oct. 5, 2012, 11:59 p.m.
Message ID <1349481543-11185-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/37859/
State Accepted
Commit 0730d3449aa28600488e73de883240ba2bd60aec
Headers show

Comments

Saul Wold - Oct. 5, 2012, 11:59 p.m.
When DISTRO_FEATURES does not include X11 ensure that both x11
and gtk are diabled correctly.  ConsoleKit also has x11, so ensure
that any RDEPENDS is also excluded.

The flags for x11 changed at somepoint to use enable/disable, but
this recipe was not updated.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    7 ++++---
 .../pulseaudio/pulseaudio_2.1.bb                   |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

Patch

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 753b013..3003eaa 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -27,7 +27,7 @@  EXTRA_OECONF = "\
 		--disable-lynx \
 		${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \
 		--disable-polkit \
-		${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)} \
+		${@base_contains('DISTRO_FEATURES', 'x11', '--enable-x11', '--disable-x11 --disable-gtk2', d)} \
 		--without-jack \
 		--with-glib \
 		--with-alsa \
@@ -117,7 +117,6 @@  python populate_packages_prepend() {
     do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' )
 }
 
-RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"
 RDEPENDS_pulseaudio-server = " \
     pulseaudio-module-filter-apply \
     pulseaudio-module-filter-heuristics \
@@ -137,7 +136,9 @@  RDEPENDS_pulseaudio-server = " \
     pulseaudio-module-rescue-streams \
     pulseaudio-module-always-sink \
     pulseaudio-module-suspend-on-idle \
-    pulseaudio-module-console-kit \
     pulseaudio-module-position-event-sounds \
     pulseaudio-module-role-cork "
 
+RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"
+RDEPENDS_pulseaudio-server += "\
+        ${@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 947aa6d..1c2c9f7 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
@@ -1,6 +1,6 @@ 
 require pulseaudio.inc
 
-PR = "r5"
+PR = "r6"
 
 DEPENDS += "libjson gdbm speex libxml-parser-perl-native"