From 99fa8e947b010fffdbe9ffe0fdb8009c9ecefdd8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 22 Jul 2015 16:47:06 -0300 Subject: opencv: Only enable 'libav' support if commercial license is whitelisted 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 Signed-off-by: Martin Jansa --- 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 27546161d2..f8946f4a4f 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," -- cgit 1.2.3-korg