jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/opencv: add gtk3 support

Browse Source 
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: Samuel 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: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Samuel Martin 2015-07-05 23:54:47 +02:00 committed by Thomas Petazzoni
parent a2afd56594
commit 70c7d46893
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/opencv/Config.in
View File

@ -70,6 +70,15 @@ comment "gtk2 support needs libgtk2"
depends on BR2_ARCH_HAS_ATOMICS # libgtk2 -> cairo depends on BR2_ARCH_HAS_ATOMICS # libgtk2 -> cairo
depends on !BR2_PACKAGE_LIBGTK2 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 config BR2_PACKAGE_OPENCV_WITH_QT
bool "qt4" bool "qt4"
depends on BR2_PACKAGE_QT depends on BR2_PACKAGE_QT

11
package/opencv/opencv.mk
View File

@ -236,11 +236,18 @@ else
OPENCV_CONF_OPTS += -DWITH_GSTREAMER=OFF OPENCV_CONF_OPTS += -DWITH_GSTREAMER=OFF
endif 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) ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK),y)
OPENCV_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=ON OPENCV_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=ON
OPENCV_DEPENDENCIES += libgtk2 OPENCV_DEPENDENCIES += libgtk2
else endif
OPENCV_CONF_OPTS += -DWITH_GTK=OFF
ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK3),y)
OPENCV_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=OFF
OPENCV_DEPENDENCIES += libgtk3
endif endif
ifeq ($(BR2_PACKAGE_OPENCV_WITH_JASPER),y) ifeq ($(BR2_PACKAGE_OPENCV_WITH_JASPER),y)