svn commit: r495896 - head/graphics/opencv

[Tobias C. Berner]

Author: tcberner
Date: Sat Mar 16 15:59:24 2019
New Revision: 495896
URL: https://svnweb.freebsd.org/changeset/ports/495896

Log:
  graphics/opencv: remove QT4 option (Qt4 deprecation)
  
  Approved by:	portmgr (implicit)

Modified:
  head/graphics/opencv/Makefile

Modified: head/graphics/opencv/Makefile
==============================================================================
--- head/graphics/opencv/Makefile	Sat Mar 16 15:57:33 2019	(r495895)
+++ head/graphics/opencv/Makefile	Sat Mar 16 15:59:24 2019	(r495896)
@@ -3,7 +3,7 @@
 
 PORTNAME=	opencv
 PORTVERSION=	3.4.1
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	graphics
 
 MAINTAINER=	ports at FreeBSD.org
@@ -154,13 +154,11 @@ OCV_MODS=		apps calib3d contrib dnn features2d flann h
 OCV_JAVA_MODS=		java
 OCV_PYTHON_MODS=	python${PYTHON_MAJOR_VER}
 
-OPTIONS_DEFINE=		EXAMPLES EXTRA_MODULES OPENGL
+OPTIONS_DEFINE=		EXAMPLES EXTRA_MODULES OPENGL GTK2
 OPTIONS_GROUP=		PERFORMANCE IMAGE VIDEO
 OPTIONS_GROUP_PERFORMANCE=	EIGEN3 OPENCL TBB
 OPTIONS_GROUP_IMAGE=	GDAL GDCM JASPER JPEG OPENEXR PNG TIFF WEBP
 OPTIONS_GROUP_VIDEO=	ARAVIS DC1394 FFMPEG GPHOTO2 GSTREAMER V4L XINE
-OPTIONS_RADIO=		GUI
-OPTIONS_RADIO_GUI=	GTK2 QT4
 # EXTRA_MODULES required for libopencv_dnn which is required by py-opencv
 OPTIONS_DEFAULT=	EIGEN3 EXTRA_MODULES FFMPEG JASPER JPEG PNG TIFF WEBP V4L \
 			${MACHINE_CPU:tu}
@@ -168,7 +166,7 @@ OPTIONS_SUB=		yes
 .if defined(OCV_CORE)
 OPTIONS_EXCLUDE=	ARAVIS DC1394 EXAMPLES EXTRA_MODULES FFMPEG \
 			GDAL GDCM GPHOTO2 GSTREAMER GTK2 JASPER JPEG \
-			OPENEXR OPENGL PNG QT4 TIFF WEBP V4L XINE
+			OPENEXR OPENGL PNG TIFF WEBP V4L XINE
 .elif defined(OCV_SLAVE)
 OPTIONS_EXCLUDE=	EXAMPLES
 .endif
@@ -266,10 +264,9 @@ EXTRA_MODULES_EXTRA_PATCHES+=	${FILESDIR}/extra-patch-
 				${FILESDIR}/extra-patch-modules_sfm_src__libmv__light_libmv_numeric_numeric.h \
 				${FILESDIR}/extra-patch-modules_stereo_src_descriptor.cpp
 
-OPENGL_DESC=		OpenGL (require QT or GTK2)
+OPENGL_DESC=		OpenGL (requires GTK2)
 OPENGL_CMAKE_BOOL=	WITH_OPENGL
 OPENGL_LIB_DEPENDS=	${PORT_OPTIONS:MGTK2:C,.+,libgtkglext-x11-1.0.so:x11-toolkits/gtkglext,}
-OPENGL_USE=		${PORT_OPTIONS:MQT4:S,$,=opengl,}
 
 # GUI
 
@@ -281,15 +278,6 @@ GTK2_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 			libfontconfig.so:x11-fonts/fontconfig \
 			liblept.so:graphics/leptonica
 
-QT4_USES=		qt:4
-QT4_USE=		QT=corelib,gui,moc_build,qmake_build,rcc_build,uic_build,qtestlib
-QT4_CMAKE_ON=		-DWITH_QT:STRING="4"
-QT4_CMAKE_OFF=		-DWITH_QT:BOOL=OFF
-QT4_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
-			libharfbuzz.so:print/harfbuzz \
-			libsz.so:science/szip \
-			liblept.so:graphics/leptonica
-
 .if defined(OCV_CORE)
 . for module in ${OCV_MODS} ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS}
 CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=OFF
@@ -327,13 +315,6 @@ CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=OFF
 
 .if !defined(OCV_JAVA)
 CMAKE_ARGS+=	-DBUILD_JAVA:BOOL=OFF
-.endif
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MQT4}
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
 .endif
 
 post-extract-EXTRA_MODULES-on: