From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yann E. MORIN Date: Sat, 27 Jun 2015 00:40:55 +0200 Subject: [Buildroot] [PATCH v6 13/16] package/opencv: add qt5 support In-Reply-To: <1435262397-888-14-git-send-email-s.martin49@gmail.com> References: <1435262397-888-1-git-send-email-s.martin49@gmail.com> <1435262397-888-14-git-send-email-s.martin49@gmail.com> Message-ID: <20150626224055.GG12470@free.fr> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Samuel, All, On 2015-06-25 21:59 +0200, Samuel Martin spake thusly: > Starting with the 2.4.6 release, OpenCV supports both Qt4 and Qt5 as GUI > toolkit, but only one can be enabled at the same time. > > Since Buildroot does not support Qt4/Qt5 co-existence, we make the Qt4 > knob depend on BR2_PACKAGE_QT5. > > Note that we usually use 'select ...' to express the dependencies > between packages, but in this case, we cannot since the Qt4/Qt5 > co-existence exclusion is not handled by a simple choice, but by some > extra dependencies in the choice entries. This makes impossible using > 'select ...' for the Qt support knob without triggering a circular > dependency at the kconfig level. > > Besides, we already use 'depends on ...' to express the dependencies > with some "big" packages (like xorg or libgtk2). qt or qt5* packages > are fairly big. So, I don't think it will hurt that much to use a > 'depends on ...' statement in this case. > > Signed-off-by: Samuel Martin > Cc: "Yann E. MORIN" [--SNIP--] > diff --git a/package/opencv/Config.in b/package/opencv/Config.in > index 040ee55..ac0443a 100644 > --- a/package/opencv/Config.in > +++ b/package/opencv/Config.in > @@ -213,6 +213,7 @@ choice > GUI toolkit for opencv_highgui module. > > OpenCV GUI toolkit preference (from the most to the least): > + - Qt5 > - Qt4 > - gtk-2 > > @@ -241,16 +242,40 @@ config BR2_PACKAGE_OPENCV_WITH_QT > bool "qt4" > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_USE_MMU # qt > - select BR2_PACKAGE_QT > + depends on 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 > + Use Qt4 with QtTest and QtGui modules and STL support, as GUI toolkit. > > -comment "qt4 needs a toolchain w/ C++" > +# no need for a comment about qt availability WRT the toolchain dependencies > +# because they are included in the opencv's ones, so already met. > + > +comment "qt4 depends on qt" comment "qt4 support needs qt" > + depends on BR2_USE_MMU # qt > + depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5 > + > +config BR2_PACKAGE_OPENCV_WITH_QT5 > + bool "qt5" > + depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_USE_MMU # qt5 No need to add those dependencies, they are inherited with the Qt5 dependency. Besides, Qt5 does not depend on MMU. > + depends on BR2_PACKAGE_QT5 > + select BR2_PACKAGE_QT5BASE > + select BR2_PACKAGE_QT5BASE_CONCURRENT > + select BR2_PACKAGE_QT5BASE_TEST BR2_PACKAGE_QT5BASE_TEST is a noop now, see package/qt5/qt5base/Config.in: 99 config BR2_PACKAGE_QT5BASE_TEST 100 def_bool y > + select BR2_PACKAGE_QT5BASE_GUI > + select BR2_PACKAGE_QT5BASE_WIDGETS > + help > + Use Qt5 with base, concurrent, test, gui and widgets components, as GUI > + toolkit. > + > +# no need for a comment about qt5 availability WRT the toolchain dependencies > +# because they are included in the opencv's ones, so already met. > + > +comment "qt5 depends on qt5" > depends on BR2_USE_MMU # qt > - depends on !BR2_INSTALL_LIBSTDCPP > + depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5 Since Qt5 can be built for noMMU, I think these dependencies are wrong. Probably we want just: comment "qt5 support needs qt5" depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5 Here's a defconfig matching all the requirements for noMMU and Qt5 available (totally untested! ;-) just to validate the comment dependencies): BR2_bfin=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_WCHAR=y BR2_TOOLCHAIN_EXTERNAL_CXX=y Regards, Yann E. MORIN. > endchoice > > diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk > index 19863f4..602b59a 100644 > --- a/package/opencv/opencv.mk > +++ b/package/opencv/opencv.mk > @@ -268,11 +268,18 @@ else > OPENCV_CONF_OPTS += -DWITH_PNG=OFF > endif > > +ifeq ($(BR2_PACKAGE_OPENCV_WITH_QT)$(BR2_PACKAGE_OPENCV_WITH_QT5),) > +OPENCV_CONF_OPTS += -DWITH_QT=OFF > +endif > + > ifeq ($(BR2_PACKAGE_OPENCV_WITH_QT),y) > OPENCV_CONF_OPTS += -DWITH_QT=4 > OPENCV_DEPENDENCIES += qt > -else > -OPENCV_CONF_OPTS += -DWITH_QT=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_OPENCV_WITH_QT5),y) > +OPENCV_CONF_OPTS += -DWITH_QT=5 > +OPENCV_DEPENDENCIES += qt5base > endif > > ifeq ($(BR2_PACKAGE_OPENCV_WITH_TIFF),y) > -- > 2.4.4 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'