+ fix: drop unwanted --enable-libtheora & --enable-libvorbis in EXTRA_OECONF
Reported-by: Andreas Oberritter <o...@opendreambox.org> Signed-off-by: Matthieu Crapet <matthieu.cra...@ingenico.com> --- meta/recipes-multimedia/libav/libav.inc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc index 1d617a2..cd5ac5f 100644 --- a/meta/recipes-multimedia/libav/libav.inc +++ b/meta/recipes-multimedia/libav/libav.inc @@ -7,8 +7,7 @@ DESCRIPTION = "Libav is a friendly and community-driven effort to provide its us HOMEPAGE = "http://libav.org/" SECTION = "libs" -LICENSE = "GPLv2+" -LICENSE_FLAGS = "commercial" +LICENSE = "GPLv2+ & LGPLv2.1+" # Provides ffmpeg compat, see http://libav.org/about.html PROVIDES = "ffmpeg" @@ -44,14 +43,20 @@ PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" PACKAGECONFIG[x11] = "--enable-x11grab,--disable-x11grab,virtual/libx11 libxfixes libxext xproto virtual/libsdl" PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" -# Check codecs that require --enable-nonfree -USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'faac', 'openssl' ], 'yes', '', d)}" +# Check codecs that trigger nonfree license +python () { + pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split() + nonfree = [ 'faac', 'openssl' ] + if set(pkgconfig) & set(nonfree): + d.setVar('LICENSE', 'Proprietary') + d.setVar('LICENSE_FLAGS', 'commercial') +} EXTRA_OECONF = " \ --enable-shared \ --enable-pthreads \ --enable-gpl \ - ${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \ + ${@bb.utils.contains('LICENSE', 'Proprietary', '--enable-nonfree', '', d)} \ --enable-avfilter \ \ --cross-prefix=${TARGET_PREFIX} \ @@ -60,8 +65,6 @@ EXTRA_OECONF = " \ --enable-avserver \ --enable-avplay \ --ld="${CCLD}" \ - --enable-libtheora \ - --enable-libvorbis \ --arch=${TARGET_ARCH} \ --target-os="linux" \ --enable-cross-compile \ -- 2.0.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core