summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/ffmpeg
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2019-09-16 12:24:24 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-18 12:09:02 +0100
commit06f3ae673b8c477a28a9922da8b1929b01509888 (patch)
treeab1461326a9857d7ce871f2fdeec6b182441cb7f /meta/recipes-multimedia/ffmpeg
parent8f38568a6450856e9335a8e7d49c84ecfc7ada9e (diff)
downloadpoky-06f3ae673b8c477a28a9922da8b1929b01509888.tar.gz
ffmpeg: add PACKAGECONFIG controls for alsa and zlib (enable by default)
Also move the libogg dependency to the theora PACKAGECONFIG, since according to the configure script, theora is the specific component which requires it. (From OE-Core rev: 7ddfb9374f493bb1cc42a204c80e783baa288152) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg')
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb8
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
39PROVIDES = "libav libpostproc" 39PROVIDES = "libav libpostproc"
40 40
41DEPENDS = "alsa-lib zlib libogg nasm-native" 41DEPENDS = "nasm-native"
42 42
43inherit autotools pkgconfig 43inherit autotools pkgconfig
44 44
45PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \ 45PACKAGECONFIG ??= "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"
57PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample" 57PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample"
58 58
59# features to support 59# features to support
60PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
60PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2" 61PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2"
61PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl" 62PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl"
62PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm" 63PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm"
@@ -68,13 +69,14 @@ PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame"
68PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" 69PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
69PACKAGECONFIG[sdl2] = "--enable-sdl2,--disable-sdl2,virtual/libsdl2" 70PACKAGECONFIG[sdl2] = "--enable-sdl2,--disable-sdl2,virtual/libsdl2"
70PACKAGECONFIG[speex] = "--enable-libspeex,--disable-libspeex,speex" 71PACKAGECONFIG[speex] = "--enable-libspeex,--disable-libspeex,speex"
71PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora" 72PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora libogg"
72PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" 73PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva"
73PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" 74PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
74PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" 75PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx"
75PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" 76PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264"
76PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb" 77PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb"
77PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" 78PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv"
79PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
78 80
79# Check codecs that require --enable-nonfree 81# Check codecs that require --enable-nonfree
80USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'openssl' ], 'yes', '', d)}" 82USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'openssl' ], 'yes', '', d)}"