From: Christopher Larson <kergoth@gmail.com>
Date: Fri, 13 Dec 2013 14:47:11 +0000 (-0700)
Subject: pulseaudio: only package consolekit module when x11 is enabled
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~35104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e148f863d55728bbfa2d94b602b03dc56b70d4c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

pulseaudio: only package consolekit module when x11 is enabled

As requested by Martin Jansa <martin.jansa@gmail.com>.

Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 2bee9eb164a..dce85550a60 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -74,7 +74,7 @@ USERADD_PARAM_pulseaudio-server = "--system --home /var/run/pulse \
 # adding the console-kit module to an image, we also get the necessary
 # consolekit package produced.
 PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-mainloop-glib \
-             pulseaudio-server pulseaudio-misc pulseaudio-module-console-kit"
+             pulseaudio-server pulseaudio-misc ${@base_contains('PACKAGECONFIG', 'x11', 'pulseaudio-module-console-kit', '', d)}"
 
 #upgrade path:
 RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"