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 <net...@gmail.com>
---
meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb
b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb
index 3f0cbf8..e7b20fa 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb
@@ -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"
--
2.7.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
