From 8caa5921da97d8d4e8434e1381da43697e6232a2 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Sat, 27 Feb 2016 01:14:16 +1100 Subject: ffmpeg: add bzlib, lzma and xv PACKAGECONFIGs (From OE-Core rev: 2a3276653b110f020e2f906be5d6966c9b6efbb3) Signed-off-by: Jonathan Liu Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb index 3f0cbf84f0..036d4f147d 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb @@ -29,14 +29,16 @@ DEPENDS = "alsa-lib zlib libogg yasm-native" 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 avfilter bzlib gpl lzma theora x264 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xv', '', d)}" +PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice" PACKAGECONFIG[avfilter] = "--enable-avfilter,--disable-avfilter" +PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2" PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac" PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl" PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm" PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack" PACKAGECONFIG[libvorbis] = "--enable-libvorbis,--disable-libvorbis,libvorbis" +PACKAGECONFIG[lzma] = "--enable-lzma,--disable-lzma,xz" PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame" PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" PACKAGECONFIG[schroedinger] = "--enable-libschroedinger,--disable-libschroedinger,schroedinger" @@ -46,6 +48,7 @@ PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" PACKAGECONFIG[x11] = "--enable-x11grab,--disable-x11grab,virtual/libx11 libxfixes libxext xproto virtual/libsdl" PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" +PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" # Check codecs that require --enable-nonfree USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'faac', 'openssl' ], 'yes', '', d)}" -- cgit v1.2.3-54-g00ecf