summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-03-13 13:10:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-14 13:17:40 +0000
commit4992d99b15938a1293d0b8d67ff438d1989b0d8f (patch)
treecd5ff76ffde8d7da6f4c39e01864fee5f69da420 /meta/recipes-multimedia
parent50e4d4c3123dff43bd4abecccae1f3ae13784e9b (diff)
downloadpoky-4992d99b15938a1293d0b8d67ff438d1989b0d8f.tar.gz
pulseaudio: add X library dependencies
PulseAudio requires libxtst, libice, libsm and libxcb when X11 is enabled (in our case, when x11 is in DISTRO_FEATURES), so conditionally add those to DEPENDS. (From OE-Core rev: a758df3d72942f985fe46455aa075e52100a1156) Signed-off-by: Paul Eggleton <paul.eggleton@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.inc3
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb2
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index dda0352ae4..a653af5378 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -7,7 +7,8 @@ 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 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 gtk+', '', d)}" 10DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \
11 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)}"
11# optional 12# optional
12DEPENDS += "udev alsa-lib glib-2.0 dbus consolekit \ 13DEPENDS += "udev alsa-lib glib-2.0 dbus consolekit \
13 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}" 14 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
index 3055994249..e98a59188e 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
@@ -1,6 +1,6 @@
1require pulseaudio.inc 1require pulseaudio.inc
2 2
3PR = "r6" 3PR = "r7"
4 4
5DEPENDS += "libjson gdbm speex libxml-parser-perl-native" 5DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
6 6