| Message ID | 1436036821-10073-4-git-send-email-s.martin49@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
Samuel, All, On 2015-07-04 21:06 +0200, Samuel Martin spake thusly: > This patch moves the existing Qt4 and gtk2 options in that choice right > after the highgui knob. > In OpenCV, only one GUI toolkik will be actually used at the time by the > highgui module, given priority to Qt4. > > Suggested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Signed-off-by: Samuel Martin <s.martin49@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, Yann E. MORIN. > --- > changes v6->v7: > - move choice right after highgui knob (Yann) > - reword help text and comment (Yann) > > changes v5->v6: > - new patch > --- > package/opencv/Config.in | 76 +++++++++++++++++++++++++++++++++--------------- > 1 file changed, 53 insertions(+), 23 deletions(-) > > diff --git a/package/opencv/Config.in b/package/opencv/Config.in > index 92a1306..9479b35 100644 > --- a/package/opencv/Config.in > +++ b/package/opencv/Config.in > @@ -52,6 +52,59 @@ config BR2_PACKAGE_OPENCV_LIB_HIGHGUI > Include opencv_highgui (high-level gui and media i/o) module into the > OpenCV build. > > +choice > + prompt "gui toolkit" > + depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI > + help > + GUI toolkit for opencv_highgui module. > + > + The best toolkit to work with OpenCV are, in decreasing order of > + preference by the OpenCV build system): > + - Qt4 > + - gtk2 > + > + Note that, whatever you choose here will be used by OpenCV, even > + if you also enabled a more preferred toolkit in your Buildroot > + configuration. > + > +config BR2_PACKAGE_OPENCV_GUI_NONE > + bool "none" > + > +config BR2_PACKAGE_OPENCV_WITH_GTK > + bool "gtk2" > + depends on BR2_ARCH_HAS_ATOMICS # libgtk2 -> cairo > + depends on BR2_USE_MMU # libgtk2 -> libglib2 > + depends on BR2_USE_WCHAR # libgtk2 -> libglib2 > + depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 > + depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_LIBGTK2 > + > +comment "gtk2 needs X.org and a toolchain w/ wchar, threads, C++" > + depends on BR2_USE_MMU # libgtk2 -> glib2 > + depends on BR2_ARCH_HAS_ATOMICS # libgtk2 -> cairo > + depends on !BR2_PACKAGE_XORG7 || \ > + !BR2_USE_WCHAR || \ > + !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_INSTALL_LIBSTDCPP > + > +config BR2_PACKAGE_OPENCV_WITH_QT > + bool "qt4" > + depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_USE_MMU # qt > + select BR2_PACKAGE_QT > + select BR2_PACKAGE_QT_STL > + select BR2_PACKAGE_QT_GUI_MODULE > + select BR2_PACKAGE_QT_TEST > + help > + Use Qt with QtTest module and STL support > + > +comment "qt4 needs a toolchain w/ C++" > + depends on BR2_USE_MMU # qt > + depends on !BR2_INSTALL_LIBSTDCPP > + > +endchoice > + > config BR2_PACKAGE_OPENCV_LIB_IMGCODECS > bool "imgcodecs" > select BR2_PACKAGE_OPENCV_LIB_IMGPROC > @@ -209,17 +262,6 @@ comment "gstreamer-1.x support needs a toolchain w/ wchar, threads" > > endchoice > > -config BR2_PACKAGE_OPENCV_WITH_GTK > - bool "gtk support" > - depends on BR2_PACKAGE_XORG7 > - depends on BR2_USE_WCHAR # libgtk2 -> libglib2 > - depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 > - depends on BR2_INSTALL_LIBSTDCPP > - depends on BR2_USE_MMU # libgtk2 -> glib2 > - depends on BR2_ARCH_HAS_ATOMICS # libgtk2 -> cairo > - depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI > - select BR2_PACKAGE_LIBGTK2 > - > config BR2_PACKAGE_OPENCV_WITH_JASPER > bool "jpeg2000 support" > select BR2_PACKAGE_JASPER > @@ -242,18 +284,6 @@ config BR2_PACKAGE_OPENCV_WITH_PNG > help > Use shared libpng from the target system. > > -config BR2_PACKAGE_OPENCV_WITH_QT > - bool "qt backend support" > - depends on BR2_INSTALL_LIBSTDCPP > - depends on BR2_USE_MMU # qt > - depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI > - select BR2_PACKAGE_QT > - select BR2_PACKAGE_QT_STL > - select BR2_PACKAGE_QT_GUI_MODULE > - select BR2_PACKAGE_QT_TEST > - help > - Use Qt with QtTest module and STL support > - > config BR2_PACKAGE_OPENCV_WITH_TIFF > bool "tiff support" > select BR2_PACKAGE_TIFF > -- > 2.4.5 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/package/opencv/Config.in b/package/opencv/Config.in index 92a1306..9479b35 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -52,6 +52,59 @@ config BR2_PACKAGE_OPENCV_LIB_HIGHGUI Include opencv_highgui (high-level gui and media i/o) module into the OpenCV build. +choice + prompt "gui toolkit" + depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI + help + GUI toolkit for opencv_highgui module. + + The best toolkit to work with OpenCV are, in decreasing order of + preference by the OpenCV build system): + - Qt4 + - gtk2 + + Note that, whatever you choose here will be used by OpenCV, even + if you also enabled a more preferred toolkit in your Buildroot + configuration. + +config BR2_PACKAGE_OPENCV_GUI_NONE + bool "none" + +config BR2_PACKAGE_OPENCV_WITH_GTK + bool "gtk2" + depends on BR2_ARCH_HAS_ATOMICS # libgtk2 -> cairo + depends on BR2_USE_MMU # libgtk2 -> libglib2 + depends on BR2_USE_WCHAR # libgtk2 -> libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBGTK2 + +comment "gtk2 needs X.org and a toolchain w/ wchar, threads, C++" + depends on BR2_USE_MMU # libgtk2 -> glib2 + depends on BR2_ARCH_HAS_ATOMICS # libgtk2 -> cairo + depends on !BR2_PACKAGE_XORG7 || \ + !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP + +config BR2_PACKAGE_OPENCV_WITH_QT + bool "qt4" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_MMU # qt + select BR2_PACKAGE_QT + select BR2_PACKAGE_QT_STL + select BR2_PACKAGE_QT_GUI_MODULE + select BR2_PACKAGE_QT_TEST + help + Use Qt with QtTest module and STL support + +comment "qt4 needs a toolchain w/ C++" + depends on BR2_USE_MMU # qt + depends on !BR2_INSTALL_LIBSTDCPP + +endchoice + config BR2_PACKAGE_OPENCV_LIB_IMGCODECS bool "imgcodecs" select BR2_PACKAGE_OPENCV_LIB_IMGPROC @@ -209,17 +262,6 @@ comment "gstreamer-1.x support needs a toolchain w/ wchar, threads" endchoice -config BR2_PACKAGE_OPENCV_WITH_GTK - bool "gtk support" - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_WCHAR # libgtk2 -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # libgtk2 -> glib2 - depends on BR2_ARCH_HAS_ATOMICS # libgtk2 -> cairo - depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI - select BR2_PACKAGE_LIBGTK2 - config BR2_PACKAGE_OPENCV_WITH_JASPER bool "jpeg2000 support" select BR2_PACKAGE_JASPER @@ -242,18 +284,6 @@ config BR2_PACKAGE_OPENCV_WITH_PNG help Use shared libpng from the target system. -config BR2_PACKAGE_OPENCV_WITH_QT - bool "qt backend support" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # qt - depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI - select BR2_PACKAGE_QT - select BR2_PACKAGE_QT_STL - select BR2_PACKAGE_QT_GUI_MODULE - select BR2_PACKAGE_QT_TEST - help - Use Qt with QtTest module and STL support - config BR2_PACKAGE_OPENCV_WITH_TIFF bool "tiff support" select BR2_PACKAGE_TIFF
This patch moves the existing Qt4 and gtk2 options in that choice right after the highgui knob. In OpenCV, only one GUI toolkik will be actually used at the time by the highgui module, given priority to Qt4. Suggested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Samuel Martin <s.martin49@gmail.com> --- changes v6->v7: - move choice right after highgui knob (Yann) - reword help text and comment (Yann) changes v5->v6: - new patch --- package/opencv/Config.in | 76 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 23 deletions(-)