[oe-commits] Otavio Salvador : opencv: Disable 'gtk' backend if X11 is not available
git at git.openembedded.org
git at git.openembedded.org
Wed Aug 6 23:07:20 UTC 2014
Module: meta-openembedded.git
Branch: master-next
Commit: 2ef3cad39ca262e0fa07ad14b99f45796af5cbf5
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=2ef3cad39ca262e0fa07ad14b99f45796af5cbf5
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Tue Jul 1 10:56:02 2014 -0300
opencv: Disable 'gtk' backend if X11 is not available
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-oe/recipes-support/opencv/opencv_2.4.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb
index df512f6..4059063 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}
${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
"
-PACKAGECONFIG ??= "eigen gtk jpeg libav png tiff v4l"
+PACKAGECONFIG ??= "eigen jpeg libav png tiff v4l \
+ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)}"
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,"
More information about the Openembedded-commits
mailing list