diff options
author | Yann Dirson <yann@blade-group.com> | 2021-03-23 17:36:49 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-28 22:28:26 +0100 |
commit | e9929301d408962061ed6a94730a600fba1274d7 (patch) | |
tree | fce091defbf0a53fd09b7a3ae43f6e0d95154b3c | |
parent | fef6805f68ddd98738e3bdd2861ecb32e7e05a3a (diff) | |
download | poky-e9929301d408962061ed6a94730a600fba1274d7.tar.gz |
ffmpeg: disable GPL features by default
--disable-gpl is the upstream default, and using GPL features violates
the license when linking into non-GPL programs.
Enabling it by default breaks user expectations, may cause people to
violate the GPL by mistake.
(From OE-Core rev: ae9273f7e3b6bbf6cbdbdfbd32634cebe5c1b0ce)
Signed-off-by: Yann Dirson <yann@blade-group.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb index 9dd56fbba4..08be38ca50 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb | |||
@@ -43,7 +43,7 @@ DEPENDS = "nasm-native" | |||
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 | alsa bzlib gpl lzma pic pthreads shared theora x264 zlib \ | 46 | alsa bzlib lzma pic pthreads shared theora zlib \ |
47 | ${@bb.utils.contains('AVAILTUNES', 'mips32r2', 'mips32r2', '', d)} \ | 47 | ${@bb.utils.contains('AVAILTUNES', 'mips32r2', 'mips32r2', '', d)} \ |
48 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}" | 48 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}" |
49 | 49 | ||