mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

opencv: Only enable 'libav' support if commercial license is whitelisted

Browse Source 
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>
This commit is contained in:
Otavio Salvador
2015-07-22 16:47:06 -03:00
committed by Martin Jansa
parent 768811216f
commit 99fa8e947b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/opencv/opencv_2.4.bb
+3 -2
View File
@@ -30,8 +30,9 @@ EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}
${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
" "
PACKAGECONFIG ??= "eigen jpeg libav png tiff v4l \ PACKAGECONFIG ??= "eigen jpeg png tiff v4l \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)}" ${@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[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen,"
PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+," PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+,"
PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg,"