diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-03-13 13:10:54 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-14 13:12:42 +0000 |
| commit | a758df3d72942f985fe46455aa075e52100a1156 (patch) | |
| tree | 37f4e50607e7548701807f76ff3907ee11295827 | |
| parent | b4df1c7c79b5c801658bcf890ba3a8eab3d83189 (diff) | |
| download | openembedded-core-a758df3d72942f985fe46455aa075e52100a1156.tar.gz openembedded-core-a758df3d72942f985fe46455aa075e52100a1156.tar.bz2 openembedded-core-a758df3d72942f985fe46455aa075e52100a1156.tar.xz openembedded-core-a758df3d72942f985fe46455aa075e52100a1156.zip | |
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.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index dda0352ae..a653af537 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 \ 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 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 gtk+', '', d)}" +DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \ + ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)}" # optional DEPENDS += "udev alsa-lib glib-2.0 dbus consolekit \ ${@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 305599424..e98a59188 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb @@ -1,6 +1,6 @@ require pulseaudio.inc -PR = "r6" +PR = "r7" DEPENDS += "libjson gdbm speex libxml-parser-perl-native" |