Patchwork [CONSOLIDATED,PULL,13/25] gst-plugins-base: depend on libx11 and libxv conditionally

login
register
mail settings
Submitter Saul Wold
Date Feb. 23, 2012, 3:58 p.m.
Message ID <138ab9fd184b3443b0b062990ecbaa703c707f55.1330012543.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/21811/
State New
Headers show

Comments

Saul Wold - Feb. 23, 2012, 3:58 p.m.
From: Andreas Oberritter <obi@opendreambox.org>

* 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@opendreambox.org>
---
 .../gstreamer/gst-plugins-base_0.10.35.bb          |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Patch

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"