diff options
| author | Joshua Lock <josh@linux.intel.com> | 2011-11-04 14:41:24 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-08 14:32:55 +0000 |
| commit | 55a738ea0c7803ddcde044746547a82fd2990329 (patch) | |
| tree | b2691e760460a722a42456822876cd4c9e505ebd /meta | |
| parent | a1c15cb36475f2eafe4b8147f5b4ec4fc08ab41b (diff) | |
| download | ast2050-yocto-poky-55a738ea0c7803ddcde044746547a82fd2990329.zip ast2050-yocto-poky-55a738ea0c7803ddcde044746547a82fd2990329.tar.gz | |
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).
(From OE-Core rev: a37ed5b42717463cf1a836fd011132b16938765f)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | 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 \ |
