On Thu, Feb 16, 2017 at 2:34 AM, Andreas Oberritter <o...@opendreambox.org> wrote: > The libpostproc package has an explicit GPLv2+ license tag. > > Signed-off-by: Andreas Oberritter <o...@opendreambox.org> > --- > ...figure-allow-libpostproc-without-gpl-flag.patch | 34 > ++++++++++++++++++++++ > meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.2.bb | 1 + > 2 files changed, 35 insertions(+) > create mode 100644 > meta/recipes-multimedia/ffmpeg/ffmpeg/0002-configure-allow-libpostproc-without-gpl-flag.patch > > 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 0000000..dc11f34 > --- /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 <o...@opendreambox.org> > + > +From 9c28ed17d1184ee95819e4c576373c20fe2c3600 Mon Sep 17 00:00:00 2001 > +From: Andreas Oberritter <o...@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.
this changes the documented behavior IMO we should discuss it upstream otherwise it will be hard to explain this to legal people. > + > +Signed-off-by: Andreas Oberritter <o...@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.2.bb > b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.2.bb > index dc33bb4..555c72b 100644 > --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.2.bb > +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.2.bb > @@ -26,6 +26,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://0001-avutil-log-avoid-build-error-if-valgrind-was-removed.patch \ > + file://0002-configure-allow-libpostproc-without-gpl-flag.patch \ > " > SRC_URI[md5sum] = "e34d1b92c5d844f2a3611c741a6dba18" > SRC_URI[sha256sum] = > "3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc" > -- > 2.7.4 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
