opencv: add jasper support

[Thomas: adjust Config.in help text as suggested by Yann E. Morin.]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index 8d9599f657f7efa6132d9468b58308ca0e4f410d..bec9b9e50c655e1d0b91bbc8331caae3c9d3b5c7 100644 (file)
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -161,6 +161,16 @@ config BR2_PACKAGE_OPENCV_WITH_GTK
        depends on BR2_USE_MMU # libgtk2 -> glib2
        select BR2_PACKAGE_LIBGTK2
 
+config BR2_PACKAGE_OPENCV_WITH_JASPER
+       bool "jpeg2000 support"
+       select BR2_PACKAGE_JASPER
+       help
+         Enable jpeg2000 support.
+
+         Note: this does not use the libjasper bundled with opencv,
+         but uses the libjasper package installed system-wide by
+         Buildroot.
+
 config BR2_PACKAGE_OPENCV_WITH_JPEG
        bool "jpeg support"
        select BR2_PACKAGE_JPEG

diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index c3a6bea65bd246a5b9280ce6a9f220566a7fbc0f..1341d3208ab9b869ab5bb7e040f06654307e1f56 100644 (file)
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -184,6 +184,13 @@ else
 OPENCV_CONF_OPT += -DWITH_GTK=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_OPENCV_WITH_JASPER),y)
+OPENCV_CONF_OPT += -DWITH_JASPER=ON
+OPENCV_DEPENDENCIES += jasper
+else
+OPENCV_CONF_OPT += -DWITH_JASPER=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_OPENCV_WITH_JPEG),y)
 OPENCV_CONF_OPT += -DWITH_JPEG=ON
 OPENCV_DEPENDENCIES += jpeg