summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2011-11-04 14:41:24 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-08 14:32:55 +0000
commit55a738ea0c7803ddcde044746547a82fd2990329 (patch)
treeb2691e760460a722a42456822876cd4c9e505ebd /meta/recipes-multimedia
parenta1c15cb36475f2eafe4b8147f5b4ec4fc08ab41b (diff)
downloadpoky-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/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index bb32467015..c581eae4c6 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 \
7 file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ 7 file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
8 file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=25;md5=e4cc710e40a4d900c2c294167bc58270 \ 8 file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=25;md5=e4cc710e40a4d900c2c294167bc58270 \
9 file://src/pulsecore/vector.h;beginline=1;endline=21;md5=1b561f0a2ca47b1fa49862a6ccaacff1" 9 file://src/pulsecore/vector.h;beginline=1;endline=21;md5=1b561f0a2ca47b1fa49862a6ccaacff1"
10DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool virtual/libx11" 10DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 gtk+', '', d)}"
11# optional 11# optional
12DEPENDS += "udev alsa-lib glib-2.0 dbus consolekit \ 12DEPENDS += "udev alsa-lib glib-2.0 dbus consolekit \
13 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}" 13 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"
@@ -22,7 +22,7 @@ EXTRA_OECONF = "\
22 --disable-lynx \ 22 --disable-lynx \
23 ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \ 23 ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \
24 --disable-polkit \ 24 --disable-polkit \
25 --with-x \ 25 ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)} \
26 --without-jack \ 26 --without-jack \
27 --with-glib \ 27 --with-glib \
28 --with-alsa \ 28 --with-alsa \