diff -ur graphics/opencv.orig/Makefile graphics/opencv/Makefile --- graphics/opencv.orig/Makefile +++ graphics/opencv/Makefile @@ -2,6 +2,7 @@ PORTNAME= opencv DISTVERSION= 4.5.1 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= tcberner@FreeBSD.org @@ -19,7 +20,6 @@ libfreetype.so:print/freetype2 \ libgflags.so:devel/gflags \ libglog.so:devel/glog \ - libgphoto2.so:graphics/libgphoto2 \ libharfbuzz.so:print/harfbuzz \ libhdf5.so:science/hdf5 \ libopenblas.so:math/openblas \ @@ -40,22 +40,24 @@ CMAKE_ON= \ WITH_EIGEN \ - WITH_GDAL \ - WITH_GDCM \ - WITH_GPHOTO2 \ WITH_JASPER \ WITH_JPEG \ WITH_OPENCL \ WITH_OPENEXR \ WITH_OPENGL \ WITH_PNG \ + WITH_PROTOBUF \ WITH_TBB \ WITH_TIFF \ WITH_VULKAN \ WITH_WEBP \ OPENCV_GENERATE_PKGCONFIG \ OPENCV_ENABLE_NONFREE -CMAKE_OFF= OPENCV_GENERATE_SETUPVARS \ +CMAKE_OFF= \ + WITH_GDAL \ + WITH_GDCM \ + WITH_GTK \ + OPENCV_GENERATE_SETUPVARS \ BUILD_opencv_python2 \ BUILD_TESTS CMAKE_ARGS= -DOPENCV_EXTRA_MODULES_PATH="${WRKSRC}/contrib/modules" \ @@ -64,18 +66,41 @@ DATADIR= ${PREFIX}/share/${PORTNAME}4 -OPTIONS_DEFINE= PYTHON JAVA +OPTIONS_DEFINE= DC1394 GPHOTO2 GSTREAMER PYTHON JAVA OPENJPEG OPENMP V4L VTK OPTIONS_DEFAULT= PYTHON OPTIONS_SUB= yes +DC1394_DESC= Include IEEE1394 support +DC1394_CMAKE_BOOL= WITH_1394 +DC1394_LIB_DEPENDS= libdc1394.so:multimedia/libdc1394 + +GPHOTO2_DESC= Include gPhoto2 library support +GPHOTO2_CMAKE_BOOL= WITH_GPHOTO2 +GPHOTO2_LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 + +GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER +GSTREAMER_LIB_DEPENDS= libgstreamer-1.0.so:multimedia/gstreamer1 + JAVA_CMAKE_BOOL= BUILD_openv_java JAVA_BUILD_DEPENDS= ant:devel/apache-ant +OPENJPEG_CMAKE_BOOL= WITH_OPENJPEG +OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg + +OPENMP_CMAKE_BOOL= WITH_OPENMP + PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} PYTHON_USES= python:3.6+ PYTHON_USE_PYTHON= noflavors PYTHON_CMAKE_BOOL= BUILD_opencv_python3 + +V4L_CMAKE_BOOL= WITH_V4L +V4L_BUILD_DEPENDS= v4l_compat>=1.0.20100321:multimedia/v4l_compat + +VTK_DESC= Include VTK library support (build opencv_viz module) +VTK_CMAKE_BOOL= WITH_VTK +VTK_LIB_DEPENDS= libvtkCommonCore-9.0.so:math/vtk9 post-extract: ${MV} ${WRKSRC_contrib} ${WRKSRC}/contrib diff -ur graphics/opencv.orig/pkg-plist graphics/opencv/pkg-plist --- graphics/opencv.orig/pkg-plist +++ graphics/opencv/pkg-plist @@ -492,6 +492,12 @@ include/opencv4/opencv2/videostab/ring_buffer.hpp include/opencv4/opencv2/videostab/stabilizer.hpp include/opencv4/opencv2/videostab/wobble_suppression.hpp +%%VTK%%include/opencv4/opencv2/viz.hpp +%%VTK%%include/opencv4/opencv2/viz/types.hpp +%%VTK%%include/opencv4/opencv2/viz/viz3d.hpp +%%VTK%%include/opencv4/opencv2/viz/vizcore.hpp +%%VTK%%include/opencv4/opencv2/viz/widget_accessor.hpp +%%VTK%%include/opencv4/opencv2/viz/widgets.hpp include/opencv4/opencv2/xfeatures2d.hpp include/opencv4/opencv2/xfeatures2d/cuda.hpp include/opencv4/opencv2/xfeatures2d/nonfree.hpp @@ -680,6 +686,9 @@ lib/libopencv_videostab.so lib/libopencv_videostab.so.4.5 lib/libopencv_videostab.so.4.5.1 +%%VTK%%lib/libopencv_viz.so +%%VTK%%lib/libopencv_viz.so.4.5 +%%VTK%%lib/libopencv_viz.so.4.5.1 lib/libopencv_xfeatures2d.so lib/libopencv_xfeatures2d.so.4.5 lib/libopencv_xfeatures2d.so.4.5.1