[OE-core] [PATCH 1/2] gst-plugins-base: depend on libx11 and libxv conditionally

[Andreas Oberritter]

On 23.02.2012 01:58, Saul Wold wrote:
> On 02/17/2012 02:56 PM, Andreas Oberritter wrote:
>> * 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 e49a00c..0b287bc 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"
>>
> As with the other patches do you need to have some configure option to
> ensure that these will be exculded if perhaps the build already contains
> these libraries?

No, unless it should be supported to first build with
DISTRO_FEATURES="x11" and later on with DISTRO_FEATURES="" without
cleaning tmp in between. I don't think it's possible to get a consistent
build and feed repository that way.

If x11 is unset, libx11 can't be built and therefore gst-plugins-base
can't be built either (as noted in the commit message), currently.

Regards,
Andreas

> This also pertains to your mpeg2dev patch
> 
> Sau!