diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb index 3216f8eb00e..31cbe2711b5 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb @@ -36,13 +36,14 @@ ARM_INSTRUCTION_SET = "arm" # libpostproc was previously packaged from a separate recipe PROVIDES = "libav libpostproc" -DEPENDS = "alsa-lib zlib libogg yasm-native" +DEPENDS = "alsa-lib zlib libogg yasm-native libsdl2" inherit autotools pkgconfig PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc \ bzlib gpl lzma theora x264 \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xv', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xv', '', d)}"\ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" # libraries to build in addition to avutil PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice" @@ -72,6 +73,7 @@ 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" +PACKAGECONFIG[wayland] = "--enable-sdl2,--disable-sdl2 libsdl2" # Check codecs that require --enable-nonfree USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'openssl' ], 'yes', '', d)}" @@ -107,6 +109,7 @@ EXTRA_OECONF = " \ --datadir=${datadir}/ffmpeg \ ${@bb.utils.contains('AVAILTUNES', 'mips32r2', '', '--disable-mipsdsp --disable-mipsdspr2', d)} \ --cpu=${@cpu(d)} \ + --pkg-config=pkg-config \ " EXTRA_OECONF_append_linux-gnux32 = " --disable-asm"