diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2017-02-11 23:50:38 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2019-04-08 13:49:57 +0200 |
| commit | a6a94b27973cf2f66ee44f8ee10a53a9b73a3483 (patch) | |
| tree | ccc3c26f33066a5861fc14c4daec3acd58f37f1c | |
| parent | 100dc341fa0b0defe0a2294d8a03bb1899f7e0c7 (diff) | |
| download | openembedded-core-contrib-a6a94b27973cf2f66ee44f8ee10a53a9b73a3483.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_3.2.4.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..dc11f34d71 --- /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 9c28ed17d1184ee95819e4c576373c20fe2c3600 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 d60ffd8..cd53e6c 100755 +--- a/configure ++++ b/configure +@@ -3135,7 +3135,7 @@ avdevice_deps="avformat avcodec avutil" + avfilter_deps="avutil" + avformat_deps="avcodec avutil" + avresample_deps="avutil" +-postproc_deps="avutil gpl" ++postproc_deps="avutil" + swresample_deps="avutil" + swscale_deps="avutil" + diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb index 3216f8eb00..dfe1fdf713 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.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] = "39fd71024ac76ba35f04397021af5606" SRC_URI[sha256sum] = "6e38ff14f080c98b58cf5967573501b8cb586e3a173b591f3807d8f0660daf7a" |