[OE-core][PATCH] libomxil: Fix up commercial license flag

[OE-core][PATCH] libomxil: Fix up commercial license flag

[Joshua Watt]

The commercial license flag on libomxil is set because it may include
the Adaptive Multi-Rate audio codec (AMR) using FFmepg, which is patent
encumbered.

It turns out this component is disabled by default in the recipe; add a
PACKAGECONFIG to enable it and trigger the "commercial" LICENSE_FLAGS on
it. This make the default build configuration clean unless a user
specifically asks for AMR support, and prevents them from marking the
recipe with the "commerical" flag unnecessarily which could hide
potential problems later on.

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
---
 meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
index 2061c280e4..82cdaf54c7 100644
--- a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
+++ b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Bellagio is an opensource implementation of the Khronos OpenMAX \
 HOMEPAGE = "http://omxil.sourceforge.net/"
 
 LICENSE = "LGPLv2.1+"
-LICENSE_FLAGS = "commercial"
+LICENSE_FLAGS = "${@bb.utils.contains('PACKAGECONFIG', 'amr', 'commercial', '', d)}"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \
                     file://src/omxcore.h;beginline=1;endline=27;md5=806b1e5566c06486fe8e42b461e03a90"
 
@@ -28,6 +28,10 @@ PROVIDES += "virtual/libomxil"
 
 CFLAGS += "-fcommon"
 
+PACKAGECONFIG ??= ""
+
+PACKAGECONFIG[amr] = "--enable-amr,,"
+
 #
 # The .so files under ${libdir}/bellagio are not intended to be versioned and symlinked.
 # Make sure they get packaged in the main package.
-- 
2.30.0

Re: [OE-core][PATCH] libomxil: Fix up commercial license flag

[Joshua Watt]

Can this please be backported to gatesgarth?

On 2/12/21 10:51 AM, Joshua Watt wrote:
> The commercial license flag on libomxil is set because it may include
> the Adaptive Multi-Rate audio codec (AMR) using FFmepg, which is patent
> encumbered.
>
> It turns out this component is disabled by default in the recipe; add a
> PACKAGECONFIG to enable it and trigger the "commercial" LICENSE_FLAGS on
> it. This make the default build configuration clean unless a user
> specifically asks for AMR support, and prevents them from marking the
> recipe with the "commerical" flag unnecessarily which could hide
> potential problems later on.
>
> Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
> ---
>   meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
> index 2061c280e4..82cdaf54c7 100644
> --- a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
> +++ b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
> @@ -4,7 +4,7 @@ DESCRIPTION = "Bellagio is an opensource implementation of the Khronos OpenMAX \
>   HOMEPAGE = "http://omxil.sourceforge.net/"
>   
>   LICENSE = "LGPLv2.1+"
> -LICENSE_FLAGS = "commercial"
> +LICENSE_FLAGS = "${@bb.utils.contains('PACKAGECONFIG', 'amr', 'commercial', '', d)}"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \
>                       file://src/omxcore.h;beginline=1;endline=27;md5=806b1e5566c06486fe8e42b461e03a90"
>   
> @@ -28,6 +28,10 @@ PROVIDES += "virtual/libomxil"
>   
>   CFLAGS += "-fcommon"
>   
> +PACKAGECONFIG ??= ""
> +
> +PACKAGECONFIG[amr] = "--enable-amr,,"
> +
>   #
>   # The .so files under ${libdir}/bellagio are not intended to be versioned and symlinked.
>   # Make sure they get packaged in the main package.

Re: [OE-core][PATCH] libomxil: Fix up commercial license flag

[Anuj Mittal]

Yes, I have picked this and the weston change.

Thanks,

Anuj

On Mon, 2021-02-15 at 10:47 -0600, Joshua Watt wrote:
> Can this please be backported to gatesgarth?
> 
> On 2/12/21 10:51 AM, Joshua Watt wrote:
> > The commercial license flag on libomxil is set because it may
> > include
> > the Adaptive Multi-Rate audio codec (AMR) using FFmepg, which is
> > patent
> > encumbered.
> > 
> > It turns out this component is disabled by default in the recipe;
> > add a
> > PACKAGECONFIG to enable it and trigger the "commercial"
> > LICENSE_FLAGS on
> > it. This make the default build configuration clean unless a user
> > specifically asks for AMR support, and prevents them from marking
> > the
> > recipe with the "commerical" flag unnecessarily which could hide
> > potential problems later on.
> > 
> > Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
> > ---
> >   meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb | 6 +++++-
> >   1 file changed, 5 insertions(+), 1 deletion(-)
> > 
> > diff --git a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
> > b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
> > index 2061c280e4..82cdaf54c7 100644
> > --- a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
> > +++ b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
> > @@ -4,7 +4,7 @@ DESCRIPTION = "Bellagio is an opensource
> > implementation of the Khronos OpenMAX \
> >   HOMEPAGE = "http://omxil.sourceforge.net/"
> >   
> >   LICENSE = "LGPLv2.1+"
> > -LICENSE_FLAGS = "commercial"
> > +LICENSE_FLAGS = "${@bb.utils.contains('PACKAGECONFIG', 'amr',
> > 'commercial', '', d)}"
> >   LIC_FILES_CHKSUM =
> > "file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \
> >                      
> > file://src/omxcore.h;beginline=1;endline=27;md5=806b1e5566c06486fe8e42b461e03a90
> > "
> >   
> > @@ -28,6 +28,10 @@ PROVIDES += "virtual/libomxil"
> >   
> >   CFLAGS += "-fcommon"
> >   
> > +PACKAGECONFIG ??= ""
> > +
> > +PACKAGECONFIG[amr] = "--enable-amr,,"
> > +
> >   #
> >   # The .so files under ${libdir}/bellagio are not intended to be
> > versioned and symlinked.
> >   # Make sure they get packaged in the main package.