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

package/opencv: remove qt backend option

Browse Source 
The qt backend option uses the obsolete qt4 package, which we are about to
remove, so remove the qt backend option as well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Peter Korsgaard 2019-02-06 15:10:48 +01:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent ef84279275
commit 882ab1c2df
3 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Config.in.legacy
View File

@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2019.02" comment "Legacy options removed in 2019.02"
config BR2_PACKAGE_OPENCV_WITH_QT
bool "opencv qt backend option removed"
select BR2_LEGACY
help
The opencv qt backend option was removed.
config BR2_PACKAGE_AMD_CATALYST_CCCLE config BR2_PACKAGE_AMD_CATALYST_CCCLE
bool "catalyst control center option removed" bool "catalyst control center option removed"
select BR2_LEGACY select BR2_LEGACY

12
package/opencv/Config.in
View File

@ -266,18 +266,6 @@ config BR2_PACKAGE_OPENCV_WITH_PNG
help help
Use shared libpng from the target system. 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 config BR2_PACKAGE_OPENCV_WITH_TIFF
bool "tiff support" bool "tiff support"
select BR2_PACKAGE_TIFF select BR2_PACKAGE_TIFF

8
package/opencv/opencv.mk
View File

@ -160,6 +160,7 @@ OPENCV_CONF_OPTS += \
-DWITH_OPENGL=OFF \ -DWITH_OPENGL=OFF \
-DWITH_OPENMP=OFF \ -DWITH_OPENMP=OFF \
-DWITH_OPENNI=OFF \ -DWITH_OPENNI=OFF \
-DWITH_QT=OFF \
-DWITH_UNICAP=OFF \ -DWITH_UNICAP=OFF \
-DWITH_XINE=OFF -DWITH_XINE=OFF
@ -215,13 +216,6 @@ else
OPENCV_CONF_OPTS += -DWITH_PNG=OFF OPENCV_CONF_OPTS += -DWITH_PNG=OFF
endif 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_TIFF),y) ifeq ($(BR2_PACKAGE_OPENCV_WITH_TIFF),y)
OPENCV_CONF_OPTS += -DWITH_TIFF=ON OPENCV_CONF_OPTS += -DWITH_TIFF=ON
OPENCV_DEPENDENCIES += tiff OPENCV_DEPENDENCIES += tiff