diff --git graphics/opencv/Makefile graphics/opencv/Makefile index 29535274f..5a89ac506 100644 --- graphics/opencv/Makefile +++ graphics/opencv/Makefile @@ -1,6 +1,5 @@ PORTNAME= opencv -DISTVERSION= 4.5.1 -PORTREVISION= 3 +DISTVERSION= 4.5.2 CATEGORIES= graphics MAINTAINER= tcberner@FreeBSD.org @@ -81,6 +80,7 @@ JAVA_VARS= JAVA_BUILD=yes PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} PYTHON_USES= python:3.6+ +PYTHON_USE= python=flavors,optsuffix PYTHON_CMAKE_BOOL= BUILD_opencv_python3 LTO_CMAKE_BOOL= ENABLE_THIN_LTO diff --git graphics/opencv/distinfo graphics/opencv/distinfo index 9bbbe5176..46227a257 100644 --- graphics/opencv/distinfo +++ graphics/opencv/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1612010514 -SHA256 (opencv-opencv-4.5.1_GH0.tar.gz) = e27fe5b168918ab60d58d7ace2bd82dd14a4d0bd1d3ae182952c2113f5637513 -SIZE (opencv-opencv-4.5.1_GH0.tar.gz) = 88245766 -SHA256 (opencv-opencv_contrib-4.5.1_GH0.tar.gz) = 12c3b1ddd0b8c1a7da5b743590a288df0934e5cef243e036ca290c2e45e425f5 -SIZE (opencv-opencv_contrib-4.5.1_GH0.tar.gz) = 60602431 +TIMESTAMP = 1623570800 +SHA256 (opencv-opencv-4.5.2_GH0.tar.gz) = ae258ed50aa039279c3d36afdea5c6ecf762515836b27871a8957c610d0424f8 +SIZE (opencv-opencv-4.5.2_GH0.tar.gz) = 88925795 +SHA256 (opencv-opencv_contrib-4.5.2_GH0.tar.gz) = 9f52fd3114ac464cb4c9a2a6a485c729a223afb57b9c24848484e55cef0b5c2a +SIZE (opencv-opencv_contrib-4.5.2_GH0.tar.gz) = 60800680 SHA256 (opencv-ade-v0.1.1f_GH0.tar.gz) = c316680efbb5dd3ac4e10bb8cea345cf26a6a25ebc22418f8f0b8ca931a550e9 SIZE (opencv-ade-v0.1.1f_GH0.tar.gz) = 116074 SHA256 (opencv-opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26_GH0.tar.gz) = d93c783cdf799da7e4a9209d169390424c4c198c1c9b5eeb78ffc890afe5f332 diff --git graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake index 3027477e2..584abe337 100644 --- graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake +++ graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake @@ -1,7 +1,7 @@ The ade distdata is downloaded and moved to the proper location by the ports framework. ---- modules/gapi/cmake/DownloadADE.cmake.orig 2020-12-21 20:01:38 UTC +--- modules/gapi/cmake/DownloadADE.cmake.orig 2021-04-02 11:23:54 UTC +++ modules/gapi/cmake/DownloadADE.cmake @@ -1,23 +1,9 @@ set(ade_src_dir "${OpenCV_BINARY_DIR}/3rdparty/ade") @@ -27,4 +27,4 @@ framework. + file(GLOB_RECURSE ADE_sources "${ADE_root}/source/*.cpp") file(GLOB_RECURSE ADE_include "${ADE_root}/include/ade/*.hpp") - add_library(ade STATIC ${ADE_include} ${ADE_sources}) + add_library(ade STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} diff --git graphics/opencv/files/patch-modules_videoio_src_cap__v4l.cpp graphics/opencv/files/patch-modules_videoio_src_cap__v4l.cpp index ff6dbd235..7b3e102cf 100644 --- graphics/opencv/files/patch-modules_videoio_src_cap__v4l.cpp +++ graphics/opencv/files/patch-modules_videoio_src_cap__v4l.cpp @@ -1,6 +1,6 @@ ---- modules/videoio/src/cap_v4l.cpp.orig 2021-01-30 06:58:09 UTC +--- modules/videoio/src/cap_v4l.cpp.orig 2021-04-02 11:23:54 UTC +++ modules/videoio/src/cap_v4l.cpp -@@ -231,7 +231,9 @@ make & enjoy! +@@ -228,7 +228,9 @@ make & enjoy! #include #ifdef HAVE_CAMV4L2 diff --git graphics/opencv/pkg-plist graphics/opencv/pkg-plist index d46ddf050..68a6b8828 100644 --- graphics/opencv/pkg-plist +++ graphics/opencv/pkg-plist @@ -1,5 +1,6 @@ bin/opencv_annotation bin/opencv_interactive-calibration +bin/opencv_model_diagnostics bin/opencv_version bin/opencv_visualisation bin/opencv_waldboost_detector @@ -72,6 +73,8 @@ include/opencv4/opencv2/core/cvstd_wrapper.hpp include/opencv4/opencv2/core/detail/async_promise.hpp include/opencv4/opencv2/core/detail/exception_ptr.hpp include/opencv4/opencv2/core/directx.hpp +include/opencv4/opencv2/core/dualquaternion.hpp +include/opencv4/opencv2/core/dualquaternion.inl.hpp include/opencv4/opencv2/core/eigen.hpp include/opencv4/opencv2/core/fast_math.hpp include/opencv4/opencv2/core/hal/hal.hpp @@ -118,6 +121,9 @@ include/opencv4/opencv2/core/opengl.hpp include/opencv4/opencv2/core/operations.hpp include/opencv4/opencv2/core/optim.hpp include/opencv4/opencv2/core/ovx.hpp +include/opencv4/opencv2/core/parallel/backend/parallel_for.openmp.hpp +include/opencv4/opencv2/core/parallel/backend/parallel_for.tbb.hpp +include/opencv4/opencv2/core/parallel/parallel_backend.hpp include/opencv4/opencv2/core/persistence.hpp include/opencv4/opencv2/core/quaternion.hpp include/opencv4/opencv2/core/quaternion.inl.hpp @@ -248,6 +254,7 @@ include/opencv4/opencv2/gapi/core.hpp include/opencv4/opencv2/gapi/cpu/core.hpp include/opencv4/opencv2/gapi/cpu/gcpukernel.hpp include/opencv4/opencv2/gapi/cpu/imgproc.hpp +include/opencv4/opencv2/gapi/cpu/stereo.hpp include/opencv4/opencv2/gapi/cpu/video.hpp include/opencv4/opencv2/gapi/fluid/core.hpp include/opencv4/opencv2/gapi/fluid/gfluidbuffer.hpp @@ -300,17 +307,20 @@ include/opencv4/opencv2/gapi/own/types.hpp include/opencv4/opencv2/gapi/plaidml/core.hpp include/opencv4/opencv2/gapi/plaidml/gplaidmlkernel.hpp include/opencv4/opencv2/gapi/plaidml/plaidml.hpp +include/opencv4/opencv2/gapi/python/python.hpp include/opencv4/opencv2/gapi/render.hpp include/opencv4/opencv2/gapi/render/render.hpp include/opencv4/opencv2/gapi/render/render_types.hpp include/opencv4/opencv2/gapi/rmat.hpp include/opencv4/opencv2/gapi/s11n.hpp include/opencv4/opencv2/gapi/s11n/base.hpp +include/opencv4/opencv2/gapi/stereo.hpp include/opencv4/opencv2/gapi/streaming/cap.hpp include/opencv4/opencv2/gapi/streaming/desync.hpp include/opencv4/opencv2/gapi/streaming/format.hpp include/opencv4/opencv2/gapi/streaming/meta.hpp include/opencv4/opencv2/gapi/streaming/source.hpp +include/opencv4/opencv2/gapi/streaming/sync.hpp include/opencv4/opencv2/gapi/util/any.hpp include/opencv4/opencv2/gapi/util/compiler_hints.hpp include/opencv4/opencv2/gapi/util/copy_through_move.hpp @@ -341,11 +351,13 @@ include/opencv4/opencv2/imgcodecs/ios.h include/opencv4/opencv2/imgcodecs/legacy/constants_c.h include/opencv4/opencv2/imgcodecs/macosx.h include/opencv4/opencv2/imgproc.hpp +include/opencv4/opencv2/imgproc/bindings.hpp include/opencv4/opencv2/imgproc/detail/gcgraph.hpp include/opencv4/opencv2/imgproc/hal/hal.hpp include/opencv4/opencv2/imgproc/hal/interface.h include/opencv4/opencv2/imgproc/imgproc.hpp include/opencv4/opencv2/imgproc/imgproc_c.h +include/opencv4/opencv2/imgproc/segmentation.hpp include/opencv4/opencv2/imgproc/types_c.h include/opencv4/opencv2/intensity_transform.hpp include/opencv4/opencv2/line_descriptor.hpp @@ -397,6 +409,7 @@ include/opencv4/opencv2/reg/mapprojec.hpp include/opencv4/opencv2/reg/mapshift.hpp include/opencv4/opencv2/rgbd.hpp include/opencv4/opencv2/rgbd/depth.hpp +include/opencv4/opencv2/rgbd/detail/pose_graph.hpp include/opencv4/opencv2/rgbd/dynafu.hpp include/opencv4/opencv2/rgbd/intrinsics.hpp include/opencv4/opencv2/rgbd/kinfu.hpp @@ -468,6 +481,7 @@ include/opencv4/opencv2/tracking/tracking_internals.hpp include/opencv4/opencv2/tracking/tracking_legacy.hpp include/opencv4/opencv2/video.hpp include/opencv4/opencv2/video/background_segm.hpp +include/opencv4/opencv2/video/detail/tracking.detail.hpp include/opencv4/opencv2/video/legacy/constants_c.h include/opencv4/opencv2/video/tracking.hpp include/opencv4/opencv2/video/video.hpp @@ -492,6 +506,7 @@ include/opencv4/opencv2/videostab/outlier_rejection.hpp include/opencv4/opencv2/videostab/ring_buffer.hpp include/opencv4/opencv2/videostab/stabilizer.hpp include/opencv4/opencv2/videostab/wobble_suppression.hpp +include/opencv4/opencv2/wechat_qrcode.hpp include/opencv4/opencv2/xfeatures2d.hpp include/opencv4/opencv2/xfeatures2d/cuda.hpp include/opencv4/opencv2/xfeatures2d/nonfree.hpp @@ -500,6 +515,7 @@ include/opencv4/opencv2/ximgproc/brightedges.hpp include/opencv4/opencv2/ximgproc/color_match.hpp include/opencv4/opencv2/ximgproc/deriche_filter.hpp include/opencv4/opencv2/ximgproc/disparity_filter.hpp +include/opencv4/opencv2/ximgproc/edge_drawing.hpp include/opencv4/opencv2/ximgproc/edge_filter.hpp include/opencv4/opencv2/ximgproc/edgeboxes.hpp include/opencv4/opencv2/ximgproc/edgepreserving_filter.hpp @@ -532,170 +548,181 @@ lib/cmake/opencv4/OpenCVModules-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/opencv4/OpenCVModules.cmake lib/libopencv_alphamat.so lib/libopencv_alphamat.so.4.5 -lib/libopencv_alphamat.so.4.5.1 +lib/libopencv_alphamat.so.4.5.2 lib/libopencv_aruco.so lib/libopencv_aruco.so.4.5 -lib/libopencv_aruco.so.4.5.1 +lib/libopencv_aruco.so.4.5.2 lib/libopencv_bgsegm.so lib/libopencv_bgsegm.so.4.5 -lib/libopencv_bgsegm.so.4.5.1 +lib/libopencv_bgsegm.so.4.5.2 lib/libopencv_bioinspired.so lib/libopencv_bioinspired.so.4.5 -lib/libopencv_bioinspired.so.4.5.1 +lib/libopencv_bioinspired.so.4.5.2 lib/libopencv_calib3d.so lib/libopencv_calib3d.so.4.5 -lib/libopencv_calib3d.so.4.5.1 +lib/libopencv_calib3d.so.4.5.2 lib/libopencv_ccalib.so lib/libopencv_ccalib.so.4.5 -lib/libopencv_ccalib.so.4.5.1 +lib/libopencv_ccalib.so.4.5.2 lib/libopencv_core.so lib/libopencv_core.so.4.5 -lib/libopencv_core.so.4.5.1 +lib/libopencv_core.so.4.5.2 lib/libopencv_datasets.so lib/libopencv_datasets.so.4.5 -lib/libopencv_datasets.so.4.5.1 +lib/libopencv_datasets.so.4.5.2 lib/libopencv_dnn.so lib/libopencv_dnn.so.4.5 -lib/libopencv_dnn.so.4.5.1 +lib/libopencv_dnn.so.4.5.2 lib/libopencv_dnn_objdetect.so lib/libopencv_dnn_objdetect.so.4.5 -lib/libopencv_dnn_objdetect.so.4.5.1 +lib/libopencv_dnn_objdetect.so.4.5.2 lib/libopencv_dnn_superres.so lib/libopencv_dnn_superres.so.4.5 -lib/libopencv_dnn_superres.so.4.5.1 +lib/libopencv_dnn_superres.so.4.5.2 lib/libopencv_dpm.so lib/libopencv_dpm.so.4.5 -lib/libopencv_dpm.so.4.5.1 +lib/libopencv_dpm.so.4.5.2 lib/libopencv_face.so lib/libopencv_face.so.4.5 -lib/libopencv_face.so.4.5.1 +lib/libopencv_face.so.4.5.2 lib/libopencv_features2d.so lib/libopencv_features2d.so.4.5 -lib/libopencv_features2d.so.4.5.1 +lib/libopencv_features2d.so.4.5.2 lib/libopencv_flann.so lib/libopencv_flann.so.4.5 -lib/libopencv_flann.so.4.5.1 +lib/libopencv_flann.so.4.5.2 lib/libopencv_freetype.so lib/libopencv_freetype.so.4.5 -lib/libopencv_freetype.so.4.5.1 +lib/libopencv_freetype.so.4.5.2 lib/libopencv_fuzzy.so lib/libopencv_fuzzy.so.4.5 -lib/libopencv_fuzzy.so.4.5.1 +lib/libopencv_fuzzy.so.4.5.2 lib/libopencv_gapi.so lib/libopencv_gapi.so.4.5 -lib/libopencv_gapi.so.4.5.1 +lib/libopencv_gapi.so.4.5.2 lib/libopencv_hdf.so lib/libopencv_hdf.so.4.5 -lib/libopencv_hdf.so.4.5.1 +lib/libopencv_hdf.so.4.5.2 lib/libopencv_hfs.so lib/libopencv_hfs.so.4.5 -lib/libopencv_hfs.so.4.5.1 +lib/libopencv_hfs.so.4.5.2 lib/libopencv_highgui.so lib/libopencv_highgui.so.4.5 -lib/libopencv_highgui.so.4.5.1 +lib/libopencv_highgui.so.4.5.2 lib/libopencv_img_hash.so lib/libopencv_img_hash.so.4.5 -lib/libopencv_img_hash.so.4.5.1 +lib/libopencv_img_hash.so.4.5.2 lib/libopencv_imgcodecs.so lib/libopencv_imgcodecs.so.4.5 -lib/libopencv_imgcodecs.so.4.5.1 +lib/libopencv_imgcodecs.so.4.5.2 lib/libopencv_imgproc.so lib/libopencv_imgproc.so.4.5 -lib/libopencv_imgproc.so.4.5.1 +lib/libopencv_imgproc.so.4.5.2 lib/libopencv_intensity_transform.so lib/libopencv_intensity_transform.so.4.5 -lib/libopencv_intensity_transform.so.4.5.1 +lib/libopencv_intensity_transform.so.4.5.2 lib/libopencv_line_descriptor.so lib/libopencv_line_descriptor.so.4.5 -lib/libopencv_line_descriptor.so.4.5.1 +lib/libopencv_line_descriptor.so.4.5.2 lib/libopencv_mcc.so lib/libopencv_mcc.so.4.5 -lib/libopencv_mcc.so.4.5.1 +lib/libopencv_mcc.so.4.5.2 lib/libopencv_ml.so lib/libopencv_ml.so.4.5 -lib/libopencv_ml.so.4.5.1 +lib/libopencv_ml.so.4.5.2 lib/libopencv_objdetect.so lib/libopencv_objdetect.so.4.5 -lib/libopencv_objdetect.so.4.5.1 +lib/libopencv_objdetect.so.4.5.2 lib/libopencv_optflow.so lib/libopencv_optflow.so.4.5 -lib/libopencv_optflow.so.4.5.1 +lib/libopencv_optflow.so.4.5.2 lib/libopencv_phase_unwrapping.so lib/libopencv_phase_unwrapping.so.4.5 -lib/libopencv_phase_unwrapping.so.4.5.1 +lib/libopencv_phase_unwrapping.so.4.5.2 lib/libopencv_photo.so lib/libopencv_photo.so.4.5 -lib/libopencv_photo.so.4.5.1 +lib/libopencv_photo.so.4.5.2 lib/libopencv_plot.so lib/libopencv_plot.so.4.5 -lib/libopencv_plot.so.4.5.1 +lib/libopencv_plot.so.4.5.2 lib/libopencv_quality.so lib/libopencv_quality.so.4.5 -lib/libopencv_quality.so.4.5.1 +lib/libopencv_quality.so.4.5.2 lib/libopencv_rapid.so lib/libopencv_rapid.so.4.5 -lib/libopencv_rapid.so.4.5.1 +lib/libopencv_rapid.so.4.5.2 lib/libopencv_reg.so lib/libopencv_reg.so.4.5 -lib/libopencv_reg.so.4.5.1 +lib/libopencv_reg.so.4.5.2 lib/libopencv_rgbd.so lib/libopencv_rgbd.so.4.5 -lib/libopencv_rgbd.so.4.5.1 +lib/libopencv_rgbd.so.4.5.2 lib/libopencv_saliency.so lib/libopencv_saliency.so.4.5 -lib/libopencv_saliency.so.4.5.1 +lib/libopencv_saliency.so.4.5.2 lib/libopencv_sfm.so lib/libopencv_sfm.so.4.5 -lib/libopencv_sfm.so.4.5.1 +lib/libopencv_sfm.so.4.5.2 lib/libopencv_shape.so lib/libopencv_shape.so.4.5 -lib/libopencv_shape.so.4.5.1 +lib/libopencv_shape.so.4.5.2 lib/libopencv_stereo.so lib/libopencv_stereo.so.4.5 -lib/libopencv_stereo.so.4.5.1 +lib/libopencv_stereo.so.4.5.2 lib/libopencv_stitching.so lib/libopencv_stitching.so.4.5 -lib/libopencv_stitching.so.4.5.1 +lib/libopencv_stitching.so.4.5.2 lib/libopencv_structured_light.so lib/libopencv_structured_light.so.4.5 -lib/libopencv_structured_light.so.4.5.1 +lib/libopencv_structured_light.so.4.5.2 lib/libopencv_superres.so lib/libopencv_superres.so.4.5 -lib/libopencv_superres.so.4.5.1 +lib/libopencv_superres.so.4.5.2 lib/libopencv_surface_matching.so lib/libopencv_surface_matching.so.4.5 -lib/libopencv_surface_matching.so.4.5.1 +lib/libopencv_surface_matching.so.4.5.2 lib/libopencv_text.so lib/libopencv_text.so.4.5 -lib/libopencv_text.so.4.5.1 +lib/libopencv_text.so.4.5.2 lib/libopencv_tracking.so lib/libopencv_tracking.so.4.5 -lib/libopencv_tracking.so.4.5.1 +lib/libopencv_tracking.so.4.5.2 lib/libopencv_video.so lib/libopencv_video.so.4.5 -lib/libopencv_video.so.4.5.1 +lib/libopencv_video.so.4.5.2 lib/libopencv_videoio.so lib/libopencv_videoio.so.4.5 -lib/libopencv_videoio.so.4.5.1 +lib/libopencv_videoio.so.4.5.2 lib/libopencv_videostab.so lib/libopencv_videostab.so.4.5 -lib/libopencv_videostab.so.4.5.1 +lib/libopencv_videostab.so.4.5.2 +lib/libopencv_wechat_qrcode.so +lib/libopencv_wechat_qrcode.so.4.5 +lib/libopencv_wechat_qrcode.so.4.5.2 lib/libopencv_xfeatures2d.so lib/libopencv_xfeatures2d.so.4.5 -lib/libopencv_xfeatures2d.so.4.5.1 +lib/libopencv_xfeatures2d.so.4.5.2 lib/libopencv_ximgproc.so lib/libopencv_ximgproc.so.4.5 -lib/libopencv_ximgproc.so.4.5.1 +lib/libopencv_ximgproc.so.4.5.2 lib/libopencv_xobjdetect.so lib/libopencv_xobjdetect.so.4.5 -lib/libopencv_xobjdetect.so.4.5.1 +lib/libopencv_xobjdetect.so.4.5.2 lib/libopencv_xphoto.so lib/libopencv_xphoto.so.4.5 -lib/libopencv_xphoto.so.4.5.1 +lib/libopencv_xphoto.so.4.5.2 lib/opencv4/3rdparty/libcorrespondence.a lib/opencv4/3rdparty/libmultiview.a lib/opencv4/3rdparty/libnumeric.a +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/config-%%PYTHON_VER%%.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/config.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/load_config_py2.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/load_config_py3.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/python-%%PYTHON_VER%%/cv2%%PYTHON_EXT_SUFFIX%%.so libdata/pkgconfig/opencv4.pc +%%JAVA%%share/java/opencv4/libopencv_java452.so +%%JAVA%%share/java/opencv4/opencv-452.jar %%DATADIR%%/haarcascades/haarcascade_eye.xml %%DATADIR%%/haarcascades/haarcascade_eye_tree_eyeglasses.xml %%DATADIR%%/haarcascades/haarcascade_frontalcatface.xml @@ -722,11 +749,3 @@ libdata/pkgconfig/opencv4.pc %%DATADIR%%/quality/brisque_range_live.yml %%DATADIR%%/valgrind.supp %%DATADIR%%/valgrind_3rdparty.supp -%%JAVA%%share/java/opencv4/libopencv_java451.so -%%JAVA%%share/java/opencv4/opencv-451.jar -%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/config-%%PYTHON_VER%%.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/config.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/load_config_py2.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/load_config_py3.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/python-%%PYTHON_VER%%/cv2%%PYTHON_EXT_SUFFIX%%.so