From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yann E. MORIN Date: Sun, 4 May 2014 11:51:43 +0200 Subject: [Buildroot] [PATCH v2 19/24] opencv: add Qt5 support In-Reply-To: <1398208556-4195-20-git-send-email-s.martin49@gmail.com> References: <1398208556-4195-1-git-send-email-s.martin49@gmail.com> <1398208556-4195-20-git-send-email-s.martin49@gmail.com> Message-ID: <20140504095143.GF3211@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 2014-04-23 01:15 +0200, Samuel Martin spake thusly: > Starting with the 2.4.6 release, OpenCV supports both Qt4 and Qt5, > but only one can be enable at the same time. > > Since Buildroot does not support Qt4/Qt5 co-existence, we keep the Qt > support knob as a boolean, but make it depend on BR2_PACKAGE_QT or > BR2_PACKAGE_QT5, and automatically uses the enabled one. > > 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 a > dependency. 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 > > --- > changes v1 -> v2: > - rebase > - update threads support dependency for qt5 > --- > package/opencv/Config.in | 43 ++++++++++++++++++++++++++++++++----------- > package/opencv/opencv.mk | 4 ++-- > 2 files changed, 34 insertions(+), 13 deletions(-) > > diff --git a/package/opencv/Config.in b/package/opencv/Config.in > index 2f47869..8825060 100644 > --- a/package/opencv/Config.in > +++ b/package/opencv/Config.in > @@ -181,17 +181,38 @@ config BR2_PACKAGE_OPENCV_WITH_PNG > 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_avr32 # qt > - depends on BR2_USE_MMU # qt > - select BR2_PACKAGE_QT > - select BR2_PACKAGE_QT_STL > - select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_OPENCV_LIB_HIGHGUI > - select BR2_PACKAGE_QT_TEST if BR2_PACKAGE_OPENCV_LIB_HIGHGUI > - default y > - help > - Use Qt with QtTest module and STL support > + bool "qt support" > + depends on (BR2_PACKAGE_QT && !BR2_avr32) || \ > + (BR2_PACKAGE_QT5 && BR2_USE_MMU && BR2_INET_IPV6 && \ > + BR2_TOOLCHAIN_HAS_THREADS_NPTL) Same comment as my previous review: why do you repeat the Qt4/Qt5 dependencies since you already depend on Qt4/Qt5 ? > + select BR2_PACKAGE_QT_STL if BR2_PACKAGE_QT > + select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT && \ > + BR2_PACKAGE_OPENCV_LIB_HIGHGUI > + select BR2_PACKAGE_QT_TEST if BR2_PACKAGE_QT && \ > + BR2_PACKAGE_OPENCV_LIB_HIGHGUI > + select BR2_PACKAGE_QT5BASE if BR2_PACKAGE_QT5 > + select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5 > + select BR2_PACKAGE_QT5BASE_TEST if BR2_PACKAGE_QT5 > + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 > + select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 > + help > + Enable Qt support for OpenCV. > + > + If Qt4 is already enabled, then use Qt4 with QtTest module and STL > + support. > + > + If Qt5 is already enabled, then use Qt5 with the following components: > + base, concurrent, test, gui and widgets. > + > +if !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5 > +comment "qt support with Qt4 needs qt" > + > +comment "qt support with Qt5 needs qt5" > + depends on BR2_USE_MMU && BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS > + > +comment "qt support with Qt5 needs a toolchain w/ wchar, IPv6, theads" > + depends on !BR2_USE_MMU || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL > +endif Eeew... What about: config BR2_PACKAGE_OPENCV_WITH_QT bool "Qt backend" depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5 select BR2_PACKAGE_OPENCV_QT4_BACKEND if BR2_PACKAGE_QT select BR2_PACKAGE_OPENCV_QT5_BACKEND if BR2_PACKAGE_QT5 help Enable Qt support for OpenCV. This uses whatever Qt version you enabled: Qt4 or Qt5. config BR2_PACKAGE_OPENCV_QT4_BACKEND bool select BR2_PACKAGE_QT_STL select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_OPENCV_LIB_HIGHGUI select BR2_PACKAGE_QT_TEST if BR2_PACKAGE_OPENCV_LIB_HIGHGUI config BR2_PACKAGE_OPENCV_QT5_BACKEND bool select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_CONCURRENT select BR2_PACKAGE_QT5BASE_TEST select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS comment "Qt backend needs either Qt4 or Qt5" depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5 Then, as soon as one or the other is selected, the comment disapears, and the option becomes visible. > config BR2_PACKAGE_OPENCV_WITH_TIFF > bool "tiff support" > diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk > index c4aa967..58bc5c0 100644 > --- a/package/opencv/opencv.mk > +++ b/package/opencv/opencv.mk > @@ -207,8 +207,8 @@ OPENCV_CONF_OPT += -DWITH_PNG=OFF > endif > > ifeq ($(BR2_PACKAGE_OPENCV_WITH_QT),y) > -OPENCV_CONF_OPT += -DWITH_QT=4 > -OPENCV_DEPENDENCIES += qt > +OPENCV_CONF_OPT += -DWITH_QT=$(if $(BR2_PACKAGE_QT),4,5) > +OPENCV_DEPENDENCIES += $(if $(BR2_PACKAGE_QT),qt,qt5base) We prefer using multi-line. But I agree, this single-line is clear and concise, so I don;t much care. See: http://buildroot.net/downloads/manual/manual.html#writing-rules-mk Regards, Yann E. MORIN. > else > OPENCV_CONF_OPT += -DWITH_QT=OFF > endif > -- > 1.9.2 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'