[OE-core] [PATCH] ffmpeg: fix build when DISTRO_FEATURES doesn't contain x11

[Jonathan Liu]

Hi Martin,

It doesn't work in PACKAGECONFIG..... that is the first thing I tried.

Regards,
Jonathan

On 26 February 2016 at 22:04, Martin Jansa <martin.jansa at gmail.com> wrote:
> On Fri, Feb 26, 2016 at 09:52:25PM +1100, Jonathan Liu wrote:
>> If avdevice is enabled, libxv is used if it is detected by configure
>> for the XV outdev. However, we can't depend on libxv for avdevice when
>> DISTRO_FEATURES doesn't contain x11 as this will result in an error.
>>
>> Fix this by adding a libxv dependency only when the avdevice
>> PACKAGECONFIG is enabled and DISTRO_FEATURES contains x11. XV outdev
>> is only one of many that are supported by avdevice so it is still
>> useful to enable avdevice even if libxv is not available.
>>
>> Signed-off-by: Jonathan Liu <net147 at gmail.com>
>> ---
>>  meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb
>> index 72393b3..f29c05e 100644
>> --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb
>> +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb
>> @@ -23,11 +23,12 @@ SRC_URI[sha256sum] = "25bcedbdafadac3d09c325c1d46a51f53d858b26a260d5aed6b4f17fea
>>  PROVIDES = "libav libpostproc"
>>
>>  DEPENDS = "alsa-lib zlib libogg yasm-native"
>> +DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'avdevice', bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxv', '', d), '', d)}"
>>
>>  inherit autotools pkgconfig
>>
>>  PACKAGECONFIG ??= "avdevice avfilter gpl theora x264 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
>> -PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice, libxv"
>> +PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice"
>
> bb.utils.contains didn't work in PACKAGECONFIG?
>
> Why not
> PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice, ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxv', '', d)"
>
>>  PACKAGECONFIG[avfilter] = "--enable-avfilter,--disable-avfilter"
>>  PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac"
>>  PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl"
>> --
>> 2.7.1
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com