[oe-commits] Joshua Lock : pulseaudio: make X11 dependencies optional and add gtk+
git at git.openembedded.org
git at git.openembedded.org
Tue Nov 8 14:17:43 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: a37ed5b42717463cf1a836fd011132b16938765f
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a37ed5b42717463cf1a836fd011132b16938765f
Author: Joshua Lock <josh at linux.intel.com>
Date: Fri Nov 4 14:41:24 2011 -0700
pulseaudio: make X11 dependencies optional and add gtk+
Use the x11 distro feature to determine whether --with-x should be
passed. Further, if we're using X11 add gtk+ to DEPENDS (it's required
to build).
Signed-off-by: Joshua Lock <josh at linux.intel.com>
---
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index bb32467..c581eae 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=25;md5=e4cc710e40a4d900c2c294167bc58270 \
file://src/pulsecore/vector.h;beginline=1;endline=21;md5=1b561f0a2ca47b1fa49862a6ccaacff1"
-DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool virtual/libx11"
+DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 gtk+', '', d)}"
# optional
DEPENDS += "udev alsa-lib glib-2.0 dbus consolekit \
${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"
@@ -22,7 +22,7 @@ EXTRA_OECONF = "\
--disable-lynx \
${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \
--disable-polkit \
- --with-x \
+ ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)} \
--without-jack \
--with-glib \
--with-alsa \
More information about the Openembedded-commits
mailing list