Patchwork [meta-oe,PATCHv2,3/3] opencv: adding PACKAGECONFIG for eigen gtk jpeg libav png tiff v4l

login
register
mail settings
Submitter Lukas Bulwahn
Date Oct. 1, 2013, 7:44 a.m.
Message ID <1380613454-3799-3-git-send-email-lukas.bulwahn@oss.bmw-carit.de>
Download mbox | patch
Permalink /patch/59161/
State Accepted, archived
Commit cb4f8706e8be3f32ca406bee97b2c34fc0deb8ca
Headers show

Comments

Lukas Bulwahn - Oct. 1, 2013, 7:44 a.m.
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
---
 meta-oe/recipes-support/opencv/opencv_2.4.3.bb |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
Koen Kooi - Oct. 7, 2013, 7:51 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 01-10-13 09:44, Lukas Bulwahn schreef:
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> --- 
> meta-oe/recipes-support/opencv/opencv_2.4.3.bb |   14 ++++++++++---- 1
> file changed, 10 insertions(+), 4 deletions(-)
> 
> 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 21a4f06..a0adc32
> 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," +

Can you add one for gstreamer as well? In the past gst and libav were
mutually exclusive options for opencv, but I don't know if that's still the
case.

regards,

Koen

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFSUmf7MkyGM64RGpERAuasAKCKq/PJt7dTmZVm/hf3biGNmWx6CQCgjwml
foAecPiAacNLzoy79SY0th4=
=Kcxg
-----END PGP SIGNATURE-----

Patch

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 21a4f06..a0adc32 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