diff options
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv_3.1.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb index 961b9cba01..c74a44d9e9 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb | |||
@@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET_armv5 = "arm" | |||
10 | 10 | ||
11 | DEFAULT_PREFERENCE = "-1" | 11 | DEFAULT_PREFERENCE = "-1" |
12 | 12 | ||
13 | DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libwebp libgphoto2 protobuf protobuf-native" | 13 | DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libwebp protobuf protobuf-native" |
14 | 14 | ||
15 | SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a" | 15 | SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a" |
16 | SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c" | 16 | SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c" |
@@ -47,13 +47,14 @@ EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DI | |||
47 | " | 47 | " |
48 | EXTRA_OECMAKE_append_x86 = " -DX86=ON" | 48 | EXTRA_OECMAKE_append_x86 = " -DX86=ON" |
49 | 49 | ||
50 | PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb \ | 50 | PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ |
51 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ | 51 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ |
52 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" | 52 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" |
53 | 53 | ||
54 | PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," | 54 | PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," |
55 | PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," | 55 | PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," |
56 | PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen," | 56 | PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen," |
57 | PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," | ||
57 | PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," | 58 | PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," |
58 | PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," | 59 | PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," |
59 | PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," | 60 | PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," |