diff options
| author |   Otavio Salvador <otavio@ossystems.com.br> | 2015-07-22 16:47:06 -0300 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-07-30 20:20:41 +0200 |
| commit | 99fa8e947b010fffdbe9ffe0fdb8009c9ecefdd8 (patch) | |
| tree | 94600ccbcb28452cf3e1204bf988f87e6fec9b11 /meta-oe/recipes-support | |
| parent | 768811216f87c30b3f41db2cffb2c0a6deaca912 (diff) | |
| download | meta-openembedded-contrib-99fa8e947b010fffdbe9ffe0fdb8009c9ecefdd8.tar.gz | |
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 <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv_2.4.bb | 5 |
1 files 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," |