aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-07-22 16:47:07 -0300
committerMartin Jansa <Martin.Jansa@gmail.com>2015-07-30 20:20:42 +0200
commitebd62b9ed9ff5d8ee927764c42e24425e8f7a80e (patch)
tree7f54270a23564fdbd6bc4f6bb0766c7031177a4f
parent99fa8e947b010fffdbe9ffe0fdb8009c9ecefdd8 (diff)
downloadmeta-openembedded-contrib-ebd62b9ed9ff5d8ee927764c42e24425e8f7a80e.tar.gz
meta-openembedded-contrib-ebd62b9ed9ff5d8ee927764c42e24425e8f7a80e.tar.bz2
meta-openembedded-contrib-ebd62b9ed9ff5d8ee927764c42e24425e8f7a80e.zip
opencv: Add 'libv4l' PACKAGECONFIG
The i.MX SoCs need to allow the removal of libv4l support so a new PACKAGECONFIG option has been included. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Gary Thomas <gary@mlbassoc.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/opencv/opencv_2.4.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb
index f8946f4a4f..75441fd0c9 100644
--- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
+++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
@@ -30,7 +30,7 @@ EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}
${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
"
-PACKAGECONFIG ??= "eigen jpeg png tiff v4l \
+PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l \
${@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,"
@@ -40,6 +40,7 @@ PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav,"
PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,"
PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff,"
PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils,"
+PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils,"
PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper,"
inherit distutils-base pkgconfig cmake