From c6580ce1e4b5a80843ea27c4b4033b8770fea52f Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Fri, 17 Feb 2012 23:56:10 +0100 Subject: 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. (From OE-Core rev: 668ebf38a5b9b0dbd0f6f1a0ebfafb04afbcbf07) Signed-off-by: Andreas Oberritter Signed-off-by: Richard Purdie --- meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-multimedia') 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 6dfc26e717..93f8eb3c73 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" -- cgit v1.2.3-54-g00ecf