diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2017-02-11 23:50:38 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2020-07-02 12:18:38 +0200 |
| commit | 709c18b15a7e66837ac6a00779ead195e030cdc1 (patch) | |
| tree | 209a0f3e1acfbcc6cf87cf7bc1ecc5f200b0d9d9 | |
| parent | c66e50f7abefbd104378c515ef642dce67df4c86 (diff) | |
| download | openembedded-core-contrib-709c18b15a7e66837ac6a00779ead195e030cdc1.tar.gz | |
ffmpeg: Build libpostproc even if global gpl flag is unset
The libpostproc package has an explicit GPLv2+ license tag.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
| -rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg/0002-configure-allow-libpostproc-without-gpl-flag.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.1.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0002-configure-allow-libpostproc-without-gpl-flag.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0002-configure-allow-libpostproc-without-gpl-flag.patch new file mode 100644 index 0000000000..38c0600f36 --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/0002-configure-allow-libpostproc-without-gpl-flag.patch @@ -0,0 +1,34 @@ +Upstream-Status: inappropriate [distro-specific] + +Signed-off-by: Andreas Oberritter <obi@opendreambox.org> + +From 19eb98f69f306d99d55397cf4add7453a6cd46d1 Mon Sep 17 00:00:00 2001 +From: Andreas Oberritter <obi@opendreambox.org> +Date: Sat, 11 Feb 2017 22:57:42 +0100 +Subject: [PATCH] configure: allow libpostproc without gpl flag + +There may be GPL'ed programs in a distribution which want libpostproc, +while other GPL-incompatible programs use some of the other libraries +provided by ffmpeg. + +Since we know the license of libpostproc, we mark the resulting binary +package accordingly instead of refusing to build it. + +Signed-off-by: Andreas Oberritter <obi@opendreambox.org> +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 34c2adb4a4..155d57b68f 100755 +--- a/configure ++++ b/configure +@@ -3600,7 +3600,7 @@ avformat_suggest="libm network zlib" + avresample_deps="avutil" + avresample_suggest="libm" + avutil_suggest="clock_gettime ffnvcodec libm libdrm libmfx opencl user32 vaapi videotoolbox corefoundation corevideo coremedia bcrypt" +-postproc_deps="avutil gpl" ++postproc_deps="avutil" + postproc_suggest="libm" + swresample_deps="avutil" + swresample_suggest="libm libsoxr" diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.1.bb index ec306afaaa..f5bc966d64 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.1.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.1.bb @@ -25,6 +25,7 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ file://mips64_cpu_detection.patch \ + file://0002-configure-allow-libpostproc-without-gpl-flag.patch \ " SRC_URI[md5sum] = "67da904cf9fddeeb10a1308fc0dc39de" SRC_URI[sha256sum] = "cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4" |