diff options
| -rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb index 2d69d8bd72..307e37e3fe 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb | |||
| @@ -38,12 +38,12 @@ ARM_INSTRUCTION_SET_armv6 = "arm" | |||
| 38 | # libpostproc was previously packaged from a separate recipe | 38 | # libpostproc was previously packaged from a separate recipe |
| 39 | PROVIDES = "libav libpostproc" | 39 | PROVIDES = "libav libpostproc" |
| 40 | 40 | ||
| 41 | DEPENDS = "alsa-lib zlib libogg nasm-native" | 41 | DEPENDS = "nasm-native" |
| 42 | 42 | ||
| 43 | inherit autotools pkgconfig | 43 | inherit autotools pkgconfig |
| 44 | 44 | ||
| 45 | PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \ | 45 | PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \ |
| 46 | bzlib gpl lzma theora x264 \ | 46 | alsa bzlib gpl lzma theora x264 zlib \ |
| 47 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}" | 47 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}" |
| 48 | 48 | ||
| 49 | # libraries to build in addition to avutil | 49 | # libraries to build in addition to avutil |
| @@ -57,6 +57,7 @@ PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc" | |||
| 57 | PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample" | 57 | PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample" |
| 58 | 58 | ||
| 59 | # features to support | 59 | # features to support |
| 60 | PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" | ||
| 60 | PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2" | 61 | PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2" |
| 61 | PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl" | 62 | PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl" |
| 62 | PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm" | 63 | PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm" |
| @@ -68,13 +69,14 @@ PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame" | |||
| 68 | PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" | 69 | PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" |
| 69 | PACKAGECONFIG[sdl2] = "--enable-sdl2,--disable-sdl2,virtual/libsdl2" | 70 | PACKAGECONFIG[sdl2] = "--enable-sdl2,--disable-sdl2,virtual/libsdl2" |
| 70 | PACKAGECONFIG[speex] = "--enable-libspeex,--disable-libspeex,speex" | 71 | PACKAGECONFIG[speex] = "--enable-libspeex,--disable-libspeex,speex" |
| 71 | PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora" | 72 | PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora libogg" |
| 72 | PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" | 73 | PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" |
| 73 | PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" | 74 | PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" |
| 74 | PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" | 75 | PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" |
| 75 | PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" | 76 | PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" |
| 76 | PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb" | 77 | PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb" |
| 77 | PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" | 78 | PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" |
| 79 | PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" | ||
| 78 | 80 | ||
| 79 | # Check codecs that require --enable-nonfree | 81 | # Check codecs that require --enable-nonfree |
| 80 | USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'openssl' ], 'yes', '', d)}" | 82 | USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'openssl' ], 'yes', '', d)}" |
