From b2ba77ba9aef4d4b9287b915abad93d44144d898 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Sat, 11 Feb 2017 23:50:38 +0100 Subject: ffmpeg: Build libpostproc even if global gpl flag is unset The libpostproc package has an explicit GPLv2+ license tag. Signed-off-by: Andreas Oberritter --- ...figure-allow-libpostproc-without-gpl-flag.patch | 34 ++++++++++++++++++++++ meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/0002-configure-allow-libpostproc-without-gpl-flag.patch (limited to 'meta/recipes-multimedia') 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 + +From 9c28ed17d1184ee95819e4c576373c20fe2c3600 Mon Sep 17 00:00:00 2001 +From: Andreas Oberritter +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 +--- + 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.0.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb index 3b682c90ea..ae461b19d9 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb @@ -24,7 +24,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ - file://0001-configure-build-fix-for-P5600-with-mips-code-restruc.patch" + file://0001-configure-build-fix-for-P5600-with-mips-code-restruc.patch \ + file://0002-configure-allow-libpostproc-without-gpl-flag.patch" SRC_URI[md5sum] = "ef9b6634bb7c920efc940b4d55adf7b2" SRC_URI[sha256sum] = "12f32cee41c74435f608c30793fd616bdf53467bb513278e273e135a4c58e470" -- cgit 1.2.3-korg