Commit 70c7d468 authored by Samuel Martin's avatar Samuel Martin Committed by Thomas Petazzoni
Browse files

package/opencv: add gtk3 support 



OpenCV now also supports gtk3 as a GUI toolkit, in addition to gtk2,
but only one may be enabled at a time.

So, add gtk3 in the choice to select the GUI toolkit.

Signed-off-by: default avatarSamuel Martin <s.martin49@gmail.com>
[yann.morin.1998@free.fr: drop the superfluous depends-on for the
 kconfig symbol, since they're no longer needed now we depend-on rather
 than select]
Signed-off-by: default avatarYann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent a2afd565

package/opencv/Config.in

+9 −0
Original line number Diff line number Diff line
@@ -70,6 +70,15 @@ comment "gtk2 support needs libgtk2" 
	depends on BR2_ARCH_HAS_ATOMICS # libgtk2 -> cairo

	depends on !BR2_PACKAGE_LIBGTK2



config BR2_PACKAGE_OPENCV_WITH_GTK3

	bool "gtk3"

	depends on BR2_PACKAGE_LIBGTK3



comment "gtk3 support needs libgtk3"

	depends on BR2_USE_MMU # libgtk3 -> glib2

	depends on BR2_ARCH_HAS_ATOMICS # libgtk3 -> cairo

	depends on !BR2_PACKAGE_LIBGTK3



config BR2_PACKAGE_OPENCV_WITH_QT

	bool "qt4"

	depends on BR2_PACKAGE_QT

package/opencv/opencv.mk

+9 −2
Original line number Diff line number Diff line
@@ -236,11 +236,18 @@ else 
OPENCV_CONF_OPTS += -DWITH_GSTREAMER=OFF

endif



ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK)$(BR2_PACKAGE_OPENCV_WITH_GTK3),)

OPENCV_CONF_OPTS += -DWITH_GTK=OFF -DWITH_GTK_2_X=OFF

endif



ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK),y)

OPENCV_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=ON

OPENCV_DEPENDENCIES += libgtk2

else

OPENCV_CONF_OPTS += -DWITH_GTK=OFF

endif



ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK3),y)

OPENCV_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=OFF

OPENCV_DEPENDENCIES += libgtk3

endif



ifeq ($(BR2_PACKAGE_OPENCV_WITH_JASPER),y)