ffmpeg: fix build when DISTRO_FEATURES doesn't contain x11
PATCH v2 1/1 ffmpeg: fix build when DISTRO_FEATURES doesn't contain x11
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 <[email protected]>
--- meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb +2 -1
@@ -26,11 +26,12 @@ ARM_INSTRUCTION_SET = "arm" 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" PACKAGECONFIG[avfilter] = "--enable-avfilter,--disable-avfilter" PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac" PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl"
Signature · 1 line
2.7.1