diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2014-07-01 10:56:02 -0300 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-10 16:07:16 +0200 |
| commit | 1fe211750e11420095dd29e08eba4bb615d9ffca (patch) | |
| tree | 5e0b5954032962716cac586065df47f66bce6ed9 /meta-oe/recipes-support/opencv/opencv_2.4.bb | |
| parent | a9636f77ac00bafd1429dc52bdf2f8f2446866f9 (diff) | |
| download | meta-openembedded-1fe211750e11420095dd29e08eba4bb615d9ffca.tar.gz | |
opencv: Disable 'gtk' backend if X11 is not available
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/opencv/opencv_2.4.bb')
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv_2.4.bb | 3 |
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 df512f6f6..405906327 100644 --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb +++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb | |||
| @@ -31,7 +31,8 @@ EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR} | |||
| 31 | ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ | 31 | ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ |
| 32 | " | 32 | " |
| 33 | 33 | ||
| 34 | PACKAGECONFIG ??= "eigen gtk jpeg libav png tiff v4l" | 34 | PACKAGECONFIG ??= "eigen jpeg libav png tiff v4l \ |
| 35 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)}" | ||
| 35 | PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen," | 36 | PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen," |
| 36 | PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+," | 37 | PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+," |
| 37 | PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," | 38 | PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," |