opencv: Make gphoto2 dep optional via PACKAGECONFIG
PATCH 1/1 opencv: Make gphoto2 dep optional via PACKAGECONFIG
Opencv can build without support for gphoto2 if needed.
--- meta-oe/recipes-support/opencv/opencv_3.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta-oe/recipes-support/opencv/opencv_3.1.bb +2 -1
@@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEFAULT_PREFERENCE = "-1" -DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libwebp libgphoto2 protobuf protobuf-native" +DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libwebp protobuf protobuf-native" SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a" SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c"
@@ -54,6 +54,7 @@ PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb \ PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen," +PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper,"
Signature · 1 line
2.8.1
Quoted 3 lines · Ricardo Ribalda Delgado
Opencv can build without support for gphoto2 if needed.
Signed-off-by Ricardo Ribalda Delgado <[email protected]>
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
Op 01-06-16 om 14:33 schreef Ricardo Ribalda Delgado:
Quoted 1 line
Opencv can build without support for gphoto2 if needed.
You're changing the default without mentioning it, so please add 'gphoto2' into the default PACKAGECONFIG in v2 of this patch.
Quoted 35 lines
Signed-off-by Ricardo Ribalda Delgado <[email protected]> ---meta-oe/recipes-support/opencv/opencv_3.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
(quoted diff) +0
-0b/meta-oe/recipes-support/opencv/opencv_3.1.bb index
789512f9e0ac..512f1b3dea9b100644 --- 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"
DEFAULT_PREFERENCE= "-1"-DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libwebp libgphoto2 protobuf protobuf-native" +DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libwebp protobuf protobuf-native"
SRCREV_opencv= "92387b1ef8fad15196dd5f7fb4931444a68bc93a"SRCREV_contrib= "5409d5ad560523c85c6796cc5a009347072d883c" @@ -54,6 +54,7 @@ PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb \ PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen," +PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper,"