Date: Wed, 19 Jan 2022 12:39:34 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f917fa765063 - main - graphics/opencv: update to 4.5.5 Message-ID: <202201191239.20JCdYRO063487@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=f917fa765063af4704ca050615da300115563767 commit f917fa765063af4704ca050615da300115563767 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2022-01-19 12:36:47 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2022-01-19 12:36:47 +0000 graphics/opencv: update to 4.5.5 VTK option currently doesn't build. For FreeBSD-specific changes, of particular interest is https://github.com/opencv/opencv/commit/68e425f869a78d9cda721a1c7ed34ac15ea78974 PR: 260895 Approved by: tcberner (maintainer timeout) --- graphics/opencv/Makefile | 3 +- graphics/opencv/distinfo | 10 +-- graphics/opencv/files/patch-git_998406d | 31 ------- graphics/opencv/pkg-plist | 149 +++++++++++++++++--------------- 4 files changed, 86 insertions(+), 107 deletions(-) diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 1c561f3d126f..51e55a2c1e86 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,6 +1,5 @@ PORTNAME= opencv -DISTVERSION= 4.5.3 -PORTREVISION= 5 +DISTVERSION= 4.5.5 CATEGORIES= graphics MAINTAINER= tcberner@FreeBSD.org diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo index a93b098b8fb5..2c6587a54707 100644 --- a/graphics/opencv/distinfo +++ b/graphics/opencv/distinfo @@ -1,10 +1,10 @@ -TIMESTAMP = 1632464301 -SHA256 (opencv-opencv-4.5.3_GH0.tar.gz) = 77f616ae4bea416674d8c373984b20c8bd55e7db887fd38c6df73463a0647bab -SIZE (opencv-opencv-4.5.3_GH0.tar.gz) = 89168276 +TIMESTAMP = 1641126622 +SHA256 (opencv-opencv-4.5.5_GH0.tar.gz) = a1cfdcf6619387ca9e232687504da996aaa9f7b5689986b8331ec02cb61d28ad +SIZE (opencv-opencv-4.5.5_GH0.tar.gz) = 89879893 SHA256 (WeChatCV-opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252_GH0.tar.gz) = 7a16ad6ca511c620c2a4cbef2c7cf1ff5c31bd530ac7b43ee2ea8481683df20a SIZE (WeChatCV-opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252_GH0.tar.gz) = 920403 -SHA256 (opencv-opencv_contrib-4.5.3_GH0.tar.gz) = 73da052fd10e73aaba2560eaff10cc5177e2dcc58b27f8aedf7c649e24c233bc -SIZE (opencv-opencv_contrib-4.5.3_GH0.tar.gz) = 61046476 +SHA256 (opencv-opencv_contrib-4.5.5_GH0.tar.gz) = a97c2eaecf7a23c6dbd119a609c6d7fae903e5f9ff5f1fe678933e01c67a6c11 +SIZE (opencv-opencv_contrib-4.5.5_GH0.tar.gz) = 60563220 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 a/graphics/opencv/files/patch-git_998406d b/graphics/opencv/files/patch-git_998406d deleted file mode 100644 index bc1011b18ce5..000000000000 --- a/graphics/opencv/files/patch-git_998406d +++ /dev/null @@ -1,31 +0,0 @@ -From f7b4b750d8930b5bb6696cea6d609dc70a0597db Mon Sep 17 00:00:00 2001 -From: mikael <mikael@FreeBSD.org> -Date: Tue, 21 Sep 2021 19:46:33 +0200 -Subject: [PATCH] Detect FP16 on FreeBSD aarch64 - ---- - modules/core/src/system.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git modules/core/src/system.cpp modules/core/src/system.cpp -index d8b8f6755950..df9e8a0ce76f 100644 ---- modules/core/src/system.cpp -+++ modules/core/src/system.cpp -@@ -533,7 +533,7 @@ struct HWFeatures - } - #endif // CV_CPUID_X86 - -- #if defined __ANDROID__ || defined __linux__ -+ #if defined __ANDROID__ || defined __linux__ || defined __FreeBSD__ - #ifdef __aarch64__ - have[CV_CPU_NEON] = true; - have[CV_CPU_FP16] = true; -@@ -559,7 +559,7 @@ struct HWFeatures - CV_LOG_INFO(NULL, "- FP16 instructions is NOT enabled via build flags"); - #endif - #endif -- #elif defined __arm__ -+ #elif defined __arm__ && !defined __FreeBSD__ - int cpufile = open("/proc/self/auxv", O_RDONLY); - - if (cpufile >= 0) diff --git a/graphics/opencv/pkg-plist b/graphics/opencv/pkg-plist index a64459b258f9..68706cd34d54 100644 --- a/graphics/opencv/pkg-plist +++ b/graphics/opencv/pkg-plist @@ -72,6 +72,7 @@ include/opencv4/opencv2/core/cvstd.hpp include/opencv4/opencv2/core/cvstd.inl.hpp include/opencv4/opencv2/core/cvstd_wrapper.hpp include/opencv4/opencv2/core/detail/async_promise.hpp +include/opencv4/opencv2/core/detail/dispatch_helper.impl.hpp include/opencv4/opencv2/core/detail/exception_ptr.hpp include/opencv4/opencv2/core/directx.hpp include/opencv4/opencv2/core/dualquaternion.hpp @@ -191,6 +192,7 @@ include/opencv4/opencv2/datasets/util.hpp %%PROTOBUF%%include/opencv4/opencv2/dnn/layer.details.hpp %%PROTOBUF%%include/opencv4/opencv2/dnn/layer.hpp %%PROTOBUF%%include/opencv4/opencv2/dnn/shape_utils.hpp +%%PROTOBUF%%include/opencv4/opencv2/dnn/utils/debug_utils.hpp %%PROTOBUF%%include/opencv4/opencv2/dnn/utils/inference_engine.hpp %%PROTOBUF%%include/opencv4/opencv2/dnn/version.hpp %%PROTOBUF%%include/opencv4/opencv2/dnn_superres.hpp @@ -320,7 +322,13 @@ 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/gstreamer/gstreamerpipeline.hpp +include/opencv4/opencv2/gapi/streaming/gstreamer/gstreamersource.hpp include/opencv4/opencv2/gapi/streaming/meta.hpp +include/opencv4/opencv2/gapi/streaming/onevpl/cfg_params.hpp +include/opencv4/opencv2/gapi/streaming/onevpl/data_provider_interface.hpp +include/opencv4/opencv2/gapi/streaming/onevpl/device_selector_interface.hpp +include/opencv4/opencv2/gapi/streaming/onevpl/source.hpp include/opencv4/opencv2/gapi/streaming/source.hpp include/opencv4/opencv2/gapi/streaming/sync.hpp include/opencv4/opencv2/gapi/util/any.hpp @@ -373,6 +381,7 @@ include/opencv4/opencv2/ml/ml.hpp include/opencv4/opencv2/ml/ml.inl.hpp include/opencv4/opencv2/objdetect.hpp include/opencv4/opencv2/objdetect/detection_based_tracker.hpp +include/opencv4/opencv2/objdetect/face.hpp include/opencv4/opencv2/objdetect/objdetect.hpp include/opencv4/opencv2/opencv.hpp include/opencv4/opencv2/opencv_modules.hpp @@ -535,8 +544,10 @@ include/opencv4/opencv2/ximgproc/fourier_descriptors.hpp include/opencv4/opencv2/ximgproc/lsc.hpp include/opencv4/opencv2/ximgproc/paillou_filter.hpp include/opencv4/opencv2/ximgproc/peilin.hpp +include/opencv4/opencv2/ximgproc/radon_transform.hpp include/opencv4/opencv2/ximgproc/ridgefilter.hpp include/opencv4/opencv2/ximgproc/run_length_morphology.hpp +include/opencv4/opencv2/ximgproc/scansegment.hpp include/opencv4/opencv2/ximgproc/seeds.hpp include/opencv4/opencv2/ximgproc/segmentation.hpp include/opencv4/opencv2/ximgproc/slic.hpp @@ -556,179 +567,187 @@ lib/cmake/opencv4/OpenCVConfig.cmake lib/cmake/opencv4/OpenCVModules-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/opencv4/OpenCVModules.cmake %%EIGEN%%lib/libopencv_alphamat.so -%%EIGEN%%lib/libopencv_alphamat.so.4.5 %%EIGEN%%lib/libopencv_alphamat.so.%%SHLIB_VER%% +%%EIGEN%%lib/libopencv_alphamat.so.405 lib/libopencv_aruco.so -lib/libopencv_aruco.so.4.5 lib/libopencv_aruco.so.%%SHLIB_VER%% +lib/libopencv_aruco.so.405 %%PROTOBUF%%lib/libopencv_barcode.so -%%PROTOBUF%%lib/libopencv_barcode.so.4.5 %%PROTOBUF%%lib/libopencv_barcode.so.%%SHLIB_VER%% +%%PROTOBUF%%lib/libopencv_barcode.so.405 lib/libopencv_bgsegm.so -lib/libopencv_bgsegm.so.4.5 lib/libopencv_bgsegm.so.%%SHLIB_VER%% +lib/libopencv_bgsegm.so.405 lib/libopencv_bioinspired.so -lib/libopencv_bioinspired.so.4.5 lib/libopencv_bioinspired.so.%%SHLIB_VER%% +lib/libopencv_bioinspired.so.405 lib/libopencv_calib3d.so -lib/libopencv_calib3d.so.4.5 lib/libopencv_calib3d.so.%%SHLIB_VER%% +lib/libopencv_calib3d.so.405 lib/libopencv_ccalib.so -lib/libopencv_ccalib.so.4.5 lib/libopencv_ccalib.so.%%SHLIB_VER%% +lib/libopencv_ccalib.so.405 lib/libopencv_core.so -lib/libopencv_core.so.4.5 lib/libopencv_core.so.%%SHLIB_VER%% +lib/libopencv_core.so.405 lib/libopencv_datasets.so -lib/libopencv_datasets.so.4.5 lib/libopencv_datasets.so.%%SHLIB_VER%% +lib/libopencv_datasets.so.405 %%PROTOBUF%%lib/libopencv_dnn.so -%%PROTOBUF%%lib/libopencv_dnn.so.4.5 %%PROTOBUF%%lib/libopencv_dnn.so.%%SHLIB_VER%% +%%PROTOBUF%%lib/libopencv_dnn.so.405 %%PROTOBUF%%lib/libopencv_dnn_objdetect.so -%%PROTOBUF%%lib/libopencv_dnn_objdetect.so.4.5 %%PROTOBUF%%lib/libopencv_dnn_objdetect.so.%%SHLIB_VER%% +%%PROTOBUF%%lib/libopencv_dnn_objdetect.so.405 %%PROTOBUF%%lib/libopencv_dnn_superres.so -%%PROTOBUF%%lib/libopencv_dnn_superres.so.4.5 %%PROTOBUF%%lib/libopencv_dnn_superres.so.%%SHLIB_VER%% +%%PROTOBUF%%lib/libopencv_dnn_superres.so.405 lib/libopencv_dpm.so -lib/libopencv_dpm.so.4.5 lib/libopencv_dpm.so.%%SHLIB_VER%% +lib/libopencv_dpm.so.405 lib/libopencv_face.so -lib/libopencv_face.so.4.5 lib/libopencv_face.so.%%SHLIB_VER%% +lib/libopencv_face.so.405 lib/libopencv_features2d.so -lib/libopencv_features2d.so.4.5 lib/libopencv_features2d.so.%%SHLIB_VER%% +lib/libopencv_features2d.so.405 lib/libopencv_flann.so -lib/libopencv_flann.so.4.5 lib/libopencv_flann.so.%%SHLIB_VER%% +lib/libopencv_flann.so.405 lib/libopencv_freetype.so -lib/libopencv_freetype.so.4.5 lib/libopencv_freetype.so.%%SHLIB_VER%% +lib/libopencv_freetype.so.405 lib/libopencv_fuzzy.so -lib/libopencv_fuzzy.so.4.5 lib/libopencv_fuzzy.so.%%SHLIB_VER%% +lib/libopencv_fuzzy.so.405 lib/libopencv_gapi.so -lib/libopencv_gapi.so.4.5 lib/libopencv_gapi.so.%%SHLIB_VER%% +lib/libopencv_gapi.so.405 lib/libopencv_hdf.so -lib/libopencv_hdf.so.4.5 lib/libopencv_hdf.so.%%SHLIB_VER%% +lib/libopencv_hdf.so.405 lib/libopencv_hfs.so -lib/libopencv_hfs.so.4.5 lib/libopencv_hfs.so.%%SHLIB_VER%% +lib/libopencv_hfs.so.405 lib/libopencv_highgui.so -lib/libopencv_highgui.so.4.5 lib/libopencv_highgui.so.%%SHLIB_VER%% +lib/libopencv_highgui.so.405 lib/libopencv_img_hash.so -lib/libopencv_img_hash.so.4.5 lib/libopencv_img_hash.so.%%SHLIB_VER%% +lib/libopencv_img_hash.so.405 lib/libopencv_imgcodecs.so -lib/libopencv_imgcodecs.so.4.5 lib/libopencv_imgcodecs.so.%%SHLIB_VER%% +lib/libopencv_imgcodecs.so.405 lib/libopencv_imgproc.so -lib/libopencv_imgproc.so.4.5 lib/libopencv_imgproc.so.%%SHLIB_VER%% +lib/libopencv_imgproc.so.405 lib/libopencv_intensity_transform.so -lib/libopencv_intensity_transform.so.4.5 lib/libopencv_intensity_transform.so.%%SHLIB_VER%% +lib/libopencv_intensity_transform.so.405 lib/libopencv_line_descriptor.so -lib/libopencv_line_descriptor.so.4.5 lib/libopencv_line_descriptor.so.%%SHLIB_VER%% +lib/libopencv_line_descriptor.so.405 %%PROTOBUF%%lib/libopencv_mcc.so -%%PROTOBUF%%lib/libopencv_mcc.so.4.5 %%PROTOBUF%%lib/libopencv_mcc.so.%%SHLIB_VER%% +%%PROTOBUF%%lib/libopencv_mcc.so.405 lib/libopencv_ml.so -lib/libopencv_ml.so.4.5 lib/libopencv_ml.so.%%SHLIB_VER%% +lib/libopencv_ml.so.405 lib/libopencv_objdetect.so -lib/libopencv_objdetect.so.4.5 lib/libopencv_objdetect.so.%%SHLIB_VER%% +lib/libopencv_objdetect.so.405 lib/libopencv_optflow.so -lib/libopencv_optflow.so.4.5 lib/libopencv_optflow.so.%%SHLIB_VER%% +lib/libopencv_optflow.so.405 lib/libopencv_phase_unwrapping.so -lib/libopencv_phase_unwrapping.so.4.5 lib/libopencv_phase_unwrapping.so.%%SHLIB_VER%% +lib/libopencv_phase_unwrapping.so.405 lib/libopencv_photo.so -lib/libopencv_photo.so.4.5 lib/libopencv_photo.so.%%SHLIB_VER%% +lib/libopencv_photo.so.405 lib/libopencv_plot.so -lib/libopencv_plot.so.4.5 lib/libopencv_plot.so.%%SHLIB_VER%% +lib/libopencv_plot.so.405 lib/libopencv_quality.so -lib/libopencv_quality.so.4.5 lib/libopencv_quality.so.%%SHLIB_VER%% +lib/libopencv_quality.so.405 lib/libopencv_rapid.so -lib/libopencv_rapid.so.4.5 lib/libopencv_rapid.so.%%SHLIB_VER%% +lib/libopencv_rapid.so.405 lib/libopencv_reg.so -lib/libopencv_reg.so.4.5 lib/libopencv_reg.so.%%SHLIB_VER%% +lib/libopencv_reg.so.405 lib/libopencv_rgbd.so -lib/libopencv_rgbd.so.4.5 lib/libopencv_rgbd.so.%%SHLIB_VER%% +lib/libopencv_rgbd.so.405 lib/libopencv_saliency.so -lib/libopencv_saliency.so.4.5 lib/libopencv_saliency.so.%%SHLIB_VER%% +lib/libopencv_saliency.so.405 %%EIGEN%%lib/libopencv_sfm.so -%%EIGEN%%lib/libopencv_sfm.so.4.5 %%EIGEN%%lib/libopencv_sfm.so.%%SHLIB_VER%% +%%EIGEN%%lib/libopencv_sfm.so.405 lib/libopencv_shape.so -lib/libopencv_shape.so.4.5 lib/libopencv_shape.so.%%SHLIB_VER%% +lib/libopencv_shape.so.405 lib/libopencv_stereo.so -lib/libopencv_stereo.so.4.5 lib/libopencv_stereo.so.%%SHLIB_VER%% +lib/libopencv_stereo.so.405 lib/libopencv_stitching.so -lib/libopencv_stitching.so.4.5 lib/libopencv_stitching.so.%%SHLIB_VER%% +lib/libopencv_stitching.so.405 lib/libopencv_structured_light.so -lib/libopencv_structured_light.so.4.5 lib/libopencv_structured_light.so.%%SHLIB_VER%% +lib/libopencv_structured_light.so.405 lib/libopencv_superres.so -lib/libopencv_superres.so.4.5 lib/libopencv_superres.so.%%SHLIB_VER%% +lib/libopencv_superres.so.405 lib/libopencv_surface_matching.so -lib/libopencv_surface_matching.so.4.5 lib/libopencv_surface_matching.so.%%SHLIB_VER%% +lib/libopencv_surface_matching.so.405 %%PROTOBUF%%lib/libopencv_text.so -%%PROTOBUF%%lib/libopencv_text.so.4.5 %%PROTOBUF%%lib/libopencv_text.so.%%SHLIB_VER%% +%%PROTOBUF%%lib/libopencv_text.so.405 lib/libopencv_tracking.so -lib/libopencv_tracking.so.4.5 lib/libopencv_tracking.so.%%SHLIB_VER%% +lib/libopencv_tracking.so.405 lib/libopencv_video.so -lib/libopencv_video.so.4.5 lib/libopencv_video.so.%%SHLIB_VER%% +lib/libopencv_video.so.405 lib/libopencv_videoio.so -lib/libopencv_videoio.so.4.5 lib/libopencv_videoio.so.%%SHLIB_VER%% +lib/libopencv_videoio.so.405 lib/libopencv_videostab.so -lib/libopencv_videostab.so.4.5 lib/libopencv_videostab.so.%%SHLIB_VER%% -%%VTK%%lib/libopencv_viz.so -%%VTK%%lib/libopencv_viz.so.4.5 -%%VTK%%lib/libopencv_viz.so.%%SHLIB_VER%% +lib/libopencv_videostab.so.405 %%PROTOBUF%%lib/libopencv_wechat_qrcode.so -%%PROTOBUF%%lib/libopencv_wechat_qrcode.so.4.5 %%PROTOBUF%%lib/libopencv_wechat_qrcode.so.%%SHLIB_VER%% +%%PROTOBUF%%lib/libopencv_wechat_qrcode.so.405 lib/libopencv_xfeatures2d.so -lib/libopencv_xfeatures2d.so.4.5 lib/libopencv_xfeatures2d.so.%%SHLIB_VER%% +lib/libopencv_xfeatures2d.so.405 lib/libopencv_ximgproc.so -lib/libopencv_ximgproc.so.4.5 lib/libopencv_ximgproc.so.%%SHLIB_VER%% +lib/libopencv_ximgproc.so.405 lib/libopencv_xobjdetect.so -lib/libopencv_xobjdetect.so.4.5 lib/libopencv_xobjdetect.so.%%SHLIB_VER%% +lib/libopencv_xobjdetect.so.405 lib/libopencv_xphoto.so -lib/libopencv_xphoto.so.4.5 lib/libopencv_xphoto.so.%%SHLIB_VER%% +lib/libopencv_xphoto.so.405 %%EIGEN%%lib/opencv4/3rdparty/libcorrespondence.a %%EIGEN%%lib/opencv4/3rdparty/libmultiview.a %%EIGEN%%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/gapi/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/load_config_py2.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/load_config_py3.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/mat_wrapper/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/misc/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/misc/version.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/python-%%PYTHON_VER%%/cv2%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/utils/__init__.py libdata/pkgconfig/opencv4.pc %%DATADIR%%/haarcascades/haarcascade_eye.xml %%DATADIR%%/haarcascades/haarcascade_eye_tree_eyeglasses.xml @@ -756,13 +775,5 @@ libdata/pkgconfig/opencv4.pc %%DATADIR%%/quality/brisque_range_live.yml %%DATADIR%%/valgrind.supp %%DATADIR%%/valgrind_3rdparty.supp -%%JAVA%%share/java/opencv4/libopencv_java453.so -%%JAVA%%share/java/opencv4/opencv-453.jar -%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/_extra_py_code/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/_extra_py_code/gapi/__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 +%%JAVA%%%%JAVASHAREDIR%%/opencv4/libopencv_java455.so +%%JAVA%%%%JAVASHAREDIR%%/opencv4/opencv-455.jar
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201191239.20JCdYRO063487>