diff options
Diffstat (limited to 'meta-oe/recipes-support/opencv/opencv_2.4.bb')
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv_2.4.bb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb index df512f6f6d..63d7c8b25b 100644 --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb +++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb @@ -9,12 +9,12 @@ ARM_INSTRUCTION_SET = "arm" DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0" -SRCREV = "a4b34e7ae10351fc4d30dc55995679340efc488e" +SRCREV = "df8e28283f09825cca0c2902160b7abebcfe1b64" SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \ file://opencv-fix-pkgconfig-generation.patch \ " -PV = "2.4.8+git${SRCPV}" +PV = "2.4.9+git${SRCPV}" S = "${WORKDIR}/git" @@ -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," |