From cb4f8706e8be3f32ca406bee97b2c34fc0deb8ca Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 1 Oct 2013 07:44:14 +0000 Subject: opencv: Add PACKAGECONFIG for eigen gtk jpeg libav png tiff v4l Signed-off-by: Lukas Bulwahn Signed-off-by: Martin Jansa --- meta-oe/recipes-support/opencv/opencv_2.4.3.bb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'meta-oe/recipes-support') diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.3.bb b/meta-oe/recipes-support/opencv/opencv_2.4.3.bb index 21a4f06740..a0adc32129 100644 --- a/meta-oe/recipes-support/opencv/opencv_2.4.3.bb +++ b/meta-oe/recipes-support/opencv/opencv_2.4.3.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a ARM_INSTRUCTION_SET = "arm" -DEPENDS = "python-numpy v4l-utils libav gtk+ libtool swig swig-native python jpeg bzip2 zlib libpng tiff glib-2.0 libeigen" +DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0" SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-unix/${PV}/OpenCV-${PV}.tar.bz2 \ file://opencv-fix-pkgconfig-generation.patch \ @@ -26,14 +26,20 @@ OECMAKE_BUILDPATH = "${WORKDIR}/build-${TARGET_ARCH}" EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include \ -DBUILD_PYTHON_SUPPORT=ON \ - -DWITH_FFMPEG=ON \ -DWITH_GSTREAMER=OFF \ - -DWITH_V4L=ON \ - -DWITH_GTK=ON \ -DCMAKE_SKIP_RPATH=ON \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ " +PACKAGECONFIG ??= "eigen gtk jpeg libav png tiff v4l" +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," +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," + inherit distutils-base pkgconfig cmake export BUILD_SYS -- cgit 1.2.3-korg