[oe-commits] Andreas Oberritter : gst-plugins-base: depend on libx11 and libxv conditionally

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 668ebf38a5b9b0dbd0f6f1a0ebfafb04afbcbf07
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=668ebf38a5b9b0dbd0f6f1a0ebfafb04afbcbf07

Author: Andreas Oberritter <obi at opendreambox.org>
Date:   Fri Feb 17 23:56:10 2012 +0100

gst-plugins-base: depend on libx11 and libxv conditionally

* gst-plugins-base currently doesn't build if x11 is
  unavailable, due to unconditional dependencies on libx11
  and libxv. However, they are not required to build
  gst-plugins-base.

Signed-off-by: Andreas Oberritter <obi at opendreambox.org>

---

 .../gstreamer/gst-plugins-base_0.10.35.bb          |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
index 6dfc26e..93f8eb3 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
                     file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0"
 
-DEPENDS += "virtual/libx11 alsa-lib freetype liboil libogg libvorbis libxv libtheora avahi util-linux tremor"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}"
+DEPENDS += "alsa-lib freetype liboil libogg libvorbis libtheora avahi util-linux tremor"
 
 SRC_URI += " file://gst-plugins-base-tremor.patch"