[oe] [meta-oe][PATCH v3 1/4] opencv: Only enable 'libav' support if commercial license is whitelisted

Andreas Müller schnitzeltony at googlemail.com
Wed Jul 22 19:52:37 UTC 2015


On Wed, Jul 22, 2015 at 9:47 PM, Otavio Salvador
<otavio at ossystems.com.br> wrote:
> The libav support requires the commercial license to be
> whitelist. This makes opencv to work in non-commercial setups without
> needing to change the PACKAGECONFIG settings manually.
>
> Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
> ---
>  meta-oe/recipes-support/opencv/opencv_2.4.bb | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb
> index 2754616..f8946f4 100644
> --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
> +++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
> @@ -30,8 +30,9 @@ EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}
>                   ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
>  "
>
> -PACKAGECONFIG ??= "eigen jpeg libav png tiff v4l \
> -                   ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)}"
> +PACKAGECONFIG ??= "eigen jpeg png tiff v4l \
> +                   ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
> +                   ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}"
>  PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen,"
>  PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+,"
>  PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg,"
> --
> 2.4.6
>
Same for all patches of this series: What changes were made v1/v2/v3?

Andreas



More information about the Openembedded-devel mailing list