git: e21578d95455 - main - graphics/opencv: update to 4.6.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 31 Aug 2022 19:24:41 UTC
The branch main has been updated by tcberner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e21578d954550998435c5d6d532e2d5a67398bfe
commit e21578d954550998435c5d6d532e2d5a67398bfe
Author: Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2022-08-31 18:21:29 +0000
Commit: Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2022-08-31 19:24:26 +0000
graphics/opencv: update to 4.6.0
Changelog:
https://github.com/opencv/opencv/wiki/ChangeLog#version460
---
graphics/opencv/Makefile | 3 +-
graphics/opencv/distinfo | 10 +-
.../opencv/files/patch-cmake_OpenCVDownload.cmake | 4 +-
.../files/patch-cmake_OpenCVFindLibsGrfmt.cmake | 4 +-
...odules_core_include_opencv2_core_vsx__utils.hpp | 33 ------
.../opencv/files/patch-modules_core_src_system.cpp | 11 --
graphics/opencv/pkg-plist | 122 +++++++++++----------
7 files changed, 73 insertions(+), 114 deletions(-)
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 12c78bc75869..9353405349e0 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,6 +1,5 @@
PORTNAME= opencv
-DISTVERSION= 4.5.5
-PORTREVISION= 9
+DISTVERSION= 4.6.0
CATEGORIES= graphics
MAINTAINER= desktop@FreeBSD.org
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
index 2c6587a54707..ae31c14951eb 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1641126622
-SHA256 (opencv-opencv-4.5.5_GH0.tar.gz) = a1cfdcf6619387ca9e232687504da996aaa9f7b5689986b8331ec02cb61d28ad
-SIZE (opencv-opencv-4.5.5_GH0.tar.gz) = 89879893
+TIMESTAMP = 1661966264
+SHA256 (opencv-opencv-4.6.0_GH0.tar.gz) = 1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277
+SIZE (opencv-opencv-4.6.0_GH0.tar.gz) = 90208971
SHA256 (WeChatCV-opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252_GH0.tar.gz) = 7a16ad6ca511c620c2a4cbef2c7cf1ff5c31bd530ac7b43ee2ea8481683df20a
SIZE (WeChatCV-opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252_GH0.tar.gz) = 920403
-SHA256 (opencv-opencv_contrib-4.5.5_GH0.tar.gz) = a97c2eaecf7a23c6dbd119a609c6d7fae903e5f9ff5f1fe678933e01c67a6c11
-SIZE (opencv-opencv_contrib-4.5.5_GH0.tar.gz) = 60563220
+SHA256 (opencv-opencv_contrib-4.6.0_GH0.tar.gz) = 1777d5fd2b59029cf537e5fd6f8aa68d707075822f90bde683fcde086f85f7a7
+SIZE (opencv-opencv_contrib-4.6.0_GH0.tar.gz) = 59667769
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-cmake_OpenCVDownload.cmake b/graphics/opencv/files/patch-cmake_OpenCVDownload.cmake
index 33fe16ac87fa..17a551181568 100644
--- a/graphics/opencv/files/patch-cmake_OpenCVDownload.cmake
+++ b/graphics/opencv/files/patch-cmake_OpenCVDownload.cmake
@@ -2,9 +2,9 @@ TODO: instead of patching the callers of ocv_download() to not use it,
it would be nicer to just make ocv_download use the cached file from
${FILESDIR}
---- cmake/OpenCVDownload.cmake.orig 2021-07-18 09:08:36 UTC
+--- cmake/OpenCVDownload.cmake.orig 2022-06-05 15:32:44 UTC
+++ cmake/OpenCVDownload.cmake
-@@ -159,6 +159,7 @@ function(ocv_download)
+@@ -205,6 +205,7 @@ function(ocv_download)
ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"")
foreach(try ${OPENCV_DOWNLOAD_TRIES_LIST})
ocv_download_log("#try ${try}")
diff --git a/graphics/opencv/files/patch-cmake_OpenCVFindLibsGrfmt.cmake b/graphics/opencv/files/patch-cmake_OpenCVFindLibsGrfmt.cmake
index 9caf5aaf55e3..6371feb89063 100644
--- a/graphics/opencv/files/patch-cmake_OpenCVFindLibsGrfmt.cmake
+++ b/graphics/opencv/files/patch-cmake_OpenCVFindLibsGrfmt.cmake
@@ -1,6 +1,6 @@
---- cmake/OpenCVFindLibsGrfmt.cmake.orig 2021-07-18 11:13:32 UTC
+--- cmake/OpenCVFindLibsGrfmt.cmake.orig 2022-06-05 15:32:44 UTC
+++ cmake/OpenCVFindLibsGrfmt.cmake
-@@ -228,9 +228,9 @@ if(WITH_PNG)
+@@ -230,9 +230,9 @@ if(WITH_PNG)
include(FindPNG)
if(PNG_FOUND)
include(CheckIncludeFile)
diff --git a/graphics/opencv/files/patch-modules_core_include_opencv2_core_vsx__utils.hpp b/graphics/opencv/files/patch-modules_core_include_opencv2_core_vsx__utils.hpp
deleted file mode 100644
index 4802cdfb7ec5..000000000000
--- a/graphics/opencv/files/patch-modules_core_include_opencv2_core_vsx__utils.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- modules/core/include/opencv2/core/vsx_utils.hpp.orig 2022-03-21 01:40:15 UTC
-+++ modules/core/include/opencv2/core/vsx_utils.hpp
-@@ -324,6 +324,7 @@ VSX_IMPL_1RG(vec_udword2, vec_float4, xvcvspuxds, vec
- #define VSX_IMPL_CONVERT(rt, rg, fnm) \
- VSX_FINLINE(rt) fnm(const rg& a) { return __builtin_convertvector(a, rt); }
-
-+#ifndef vec_permi
- #if __clang_major__ < 5
- // implement vec_permi in a dirty way
- # define VSX_IMPL_CLANG_4_PERMI(Tvec) \
-@@ -351,12 +352,14 @@ VSX_FINLINE(rt) fnm(const rg& a) { return __builtin_co
- // vec_xxpermdi is missing little-endian supports in clang 4 just like gcc4
- # define vec_permi(a, b, c) vec_xxpermdi(b, a, (3 ^ (((c) & 1) << 1 | (c) >> 1)))
- #endif // __clang_major__ < 5
-+#endif // vec_permi
-
- // shift left double by word immediate
- #ifndef vec_sldw
- # define vec_sldw vec_xxsldwi
- #endif
-
-+#if __clang_major__ < 13
- // Implement vec_rsqrt since clang only supports vec_rsqrte
- #ifndef vec_rsqrt
- VSX_FINLINE(vec_float4) vec_rsqrt(const vec_float4& a)
-@@ -380,6 +383,7 @@ VSX_FINLINE(vec_udword2) vec_promote(unsigned long lon
- ret[b & 1] = a;
- return ret;
- }
-+#endif
-
- // vec_popcnt should return unsigned but clang has different thought just like gcc in vec_vpopcnt
- #define VSX_IMPL_POPCNTU(Tvec, Tvec2, ucast) \
diff --git a/graphics/opencv/files/patch-modules_core_src_system.cpp b/graphics/opencv/files/patch-modules_core_src_system.cpp
deleted file mode 100644
index b4f88573d9cb..000000000000
--- a/graphics/opencv/files/patch-modules_core_src_system.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/core/src/system.cpp.orig 2022-01-25 17:17:25 UTC
-+++ modules/core/src/system.cpp
-@@ -630,7 +630,7 @@ struct HWFeatures
- }
- }
- #elif (defined __ppc64__ || defined __PPC64__) && defined __FreeBSD__
-- unsigned int hwcap = 0;
-+ unsigned long hwcap = 0;
- elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
- if (hwcap & PPC_FEATURE_HAS_VSX) {
- elf_aux_info(AT_HWCAP2, &hwcap, sizeof(hwcap));
diff --git a/graphics/opencv/pkg-plist b/graphics/opencv/pkg-plist
index 1b37924e900a..f4e2fa75cf25 100644
--- a/graphics/opencv/pkg-plist
+++ b/graphics/opencv/pkg-plist
@@ -141,6 +141,7 @@ include/opencv4/opencv2/core/utility.hpp
include/opencv4/opencv2/core/utils/allocator_stats.hpp
include/opencv4/opencv2/core/utils/allocator_stats.impl.hpp
include/opencv4/opencv2/core/utils/filesystem.hpp
+include/opencv4/opencv2/core/utils/fp_control_utils.hpp
include/opencv4/opencv2/core/utils/instrumentation.hpp
include/opencv4/opencv2/core/utils/logger.defines.hpp
include/opencv4/opencv2/core/utils/logger.hpp
@@ -295,6 +296,8 @@ include/opencv4/opencv2/gapi/infer/ie.hpp
include/opencv4/opencv2/gapi/infer/onnx.hpp
include/opencv4/opencv2/gapi/infer/parsers.hpp
include/opencv4/opencv2/gapi/media.hpp
+include/opencv4/opencv2/gapi/oak/infer.hpp
+include/opencv4/opencv2/gapi/oak/oak.hpp
include/opencv4/opencv2/gapi/ocl/core.hpp
include/opencv4/opencv2/gapi/ocl/goclkernel.hpp
include/opencv4/opencv2/gapi/ocl/imgproc.hpp
@@ -325,6 +328,7 @@ 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/accel_types.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
@@ -568,175 +572,175 @@ lib/cmake/opencv4/OpenCVModules-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/opencv4/OpenCVModules.cmake
%%EIGEN%%lib/libopencv_alphamat.so
%%EIGEN%%lib/libopencv_alphamat.so.%%SHLIB_VER%%
-%%EIGEN%%lib/libopencv_alphamat.so.405
+%%EIGEN%%lib/libopencv_alphamat.so.406
lib/libopencv_aruco.so
lib/libopencv_aruco.so.%%SHLIB_VER%%
-lib/libopencv_aruco.so.405
+lib/libopencv_aruco.so.406
%%PROTOBUF%%lib/libopencv_barcode.so
%%PROTOBUF%%lib/libopencv_barcode.so.%%SHLIB_VER%%
-%%PROTOBUF%%lib/libopencv_barcode.so.405
+%%PROTOBUF%%lib/libopencv_barcode.so.406
lib/libopencv_bgsegm.so
lib/libopencv_bgsegm.so.%%SHLIB_VER%%
-lib/libopencv_bgsegm.so.405
+lib/libopencv_bgsegm.so.406
lib/libopencv_bioinspired.so
lib/libopencv_bioinspired.so.%%SHLIB_VER%%
-lib/libopencv_bioinspired.so.405
+lib/libopencv_bioinspired.so.406
lib/libopencv_calib3d.so
lib/libopencv_calib3d.so.%%SHLIB_VER%%
-lib/libopencv_calib3d.so.405
+lib/libopencv_calib3d.so.406
lib/libopencv_ccalib.so
lib/libopencv_ccalib.so.%%SHLIB_VER%%
-lib/libopencv_ccalib.so.405
+lib/libopencv_ccalib.so.406
lib/libopencv_core.so
lib/libopencv_core.so.%%SHLIB_VER%%
-lib/libopencv_core.so.405
+lib/libopencv_core.so.406
lib/libopencv_datasets.so
lib/libopencv_datasets.so.%%SHLIB_VER%%
-lib/libopencv_datasets.so.405
+lib/libopencv_datasets.so.406
%%PROTOBUF%%lib/libopencv_dnn.so
%%PROTOBUF%%lib/libopencv_dnn.so.%%SHLIB_VER%%
-%%PROTOBUF%%lib/libopencv_dnn.so.405
+%%PROTOBUF%%lib/libopencv_dnn.so.406
%%PROTOBUF%%lib/libopencv_dnn_objdetect.so
%%PROTOBUF%%lib/libopencv_dnn_objdetect.so.%%SHLIB_VER%%
-%%PROTOBUF%%lib/libopencv_dnn_objdetect.so.405
+%%PROTOBUF%%lib/libopencv_dnn_objdetect.so.406
%%PROTOBUF%%lib/libopencv_dnn_superres.so
%%PROTOBUF%%lib/libopencv_dnn_superres.so.%%SHLIB_VER%%
-%%PROTOBUF%%lib/libopencv_dnn_superres.so.405
+%%PROTOBUF%%lib/libopencv_dnn_superres.so.406
lib/libopencv_dpm.so
lib/libopencv_dpm.so.%%SHLIB_VER%%
-lib/libopencv_dpm.so.405
+lib/libopencv_dpm.so.406
lib/libopencv_face.so
lib/libopencv_face.so.%%SHLIB_VER%%
-lib/libopencv_face.so.405
+lib/libopencv_face.so.406
lib/libopencv_features2d.so
lib/libopencv_features2d.so.%%SHLIB_VER%%
-lib/libopencv_features2d.so.405
+lib/libopencv_features2d.so.406
lib/libopencv_flann.so
lib/libopencv_flann.so.%%SHLIB_VER%%
-lib/libopencv_flann.so.405
+lib/libopencv_flann.so.406
lib/libopencv_freetype.so
lib/libopencv_freetype.so.%%SHLIB_VER%%
-lib/libopencv_freetype.so.405
+lib/libopencv_freetype.so.406
lib/libopencv_fuzzy.so
lib/libopencv_fuzzy.so.%%SHLIB_VER%%
-lib/libopencv_fuzzy.so.405
+lib/libopencv_fuzzy.so.406
lib/libopencv_gapi.so
lib/libopencv_gapi.so.%%SHLIB_VER%%
-lib/libopencv_gapi.so.405
+lib/libopencv_gapi.so.406
lib/libopencv_hdf.so
lib/libopencv_hdf.so.%%SHLIB_VER%%
-lib/libopencv_hdf.so.405
+lib/libopencv_hdf.so.406
lib/libopencv_hfs.so
lib/libopencv_hfs.so.%%SHLIB_VER%%
-lib/libopencv_hfs.so.405
+lib/libopencv_hfs.so.406
lib/libopencv_highgui.so
lib/libopencv_highgui.so.%%SHLIB_VER%%
-lib/libopencv_highgui.so.405
+lib/libopencv_highgui.so.406
lib/libopencv_img_hash.so
lib/libopencv_img_hash.so.%%SHLIB_VER%%
-lib/libopencv_img_hash.so.405
+lib/libopencv_img_hash.so.406
lib/libopencv_imgcodecs.so
lib/libopencv_imgcodecs.so.%%SHLIB_VER%%
-lib/libopencv_imgcodecs.so.405
+lib/libopencv_imgcodecs.so.406
lib/libopencv_imgproc.so
lib/libopencv_imgproc.so.%%SHLIB_VER%%
-lib/libopencv_imgproc.so.405
+lib/libopencv_imgproc.so.406
lib/libopencv_intensity_transform.so
lib/libopencv_intensity_transform.so.%%SHLIB_VER%%
-lib/libopencv_intensity_transform.so.405
+lib/libopencv_intensity_transform.so.406
lib/libopencv_line_descriptor.so
lib/libopencv_line_descriptor.so.%%SHLIB_VER%%
-lib/libopencv_line_descriptor.so.405
+lib/libopencv_line_descriptor.so.406
%%PROTOBUF%%lib/libopencv_mcc.so
%%PROTOBUF%%lib/libopencv_mcc.so.%%SHLIB_VER%%
-%%PROTOBUF%%lib/libopencv_mcc.so.405
+%%PROTOBUF%%lib/libopencv_mcc.so.406
lib/libopencv_ml.so
lib/libopencv_ml.so.%%SHLIB_VER%%
-lib/libopencv_ml.so.405
+lib/libopencv_ml.so.406
lib/libopencv_objdetect.so
lib/libopencv_objdetect.so.%%SHLIB_VER%%
-lib/libopencv_objdetect.so.405
+lib/libopencv_objdetect.so.406
lib/libopencv_optflow.so
lib/libopencv_optflow.so.%%SHLIB_VER%%
-lib/libopencv_optflow.so.405
+lib/libopencv_optflow.so.406
lib/libopencv_phase_unwrapping.so
lib/libopencv_phase_unwrapping.so.%%SHLIB_VER%%
-lib/libopencv_phase_unwrapping.so.405
+lib/libopencv_phase_unwrapping.so.406
lib/libopencv_photo.so
lib/libopencv_photo.so.%%SHLIB_VER%%
-lib/libopencv_photo.so.405
+lib/libopencv_photo.so.406
lib/libopencv_plot.so
lib/libopencv_plot.so.%%SHLIB_VER%%
-lib/libopencv_plot.so.405
+lib/libopencv_plot.so.406
lib/libopencv_quality.so
lib/libopencv_quality.so.%%SHLIB_VER%%
-lib/libopencv_quality.so.405
+lib/libopencv_quality.so.406
lib/libopencv_rapid.so
lib/libopencv_rapid.so.%%SHLIB_VER%%
-lib/libopencv_rapid.so.405
+lib/libopencv_rapid.so.406
lib/libopencv_reg.so
lib/libopencv_reg.so.%%SHLIB_VER%%
-lib/libopencv_reg.so.405
+lib/libopencv_reg.so.406
lib/libopencv_rgbd.so
lib/libopencv_rgbd.so.%%SHLIB_VER%%
-lib/libopencv_rgbd.so.405
+lib/libopencv_rgbd.so.406
lib/libopencv_saliency.so
lib/libopencv_saliency.so.%%SHLIB_VER%%
-lib/libopencv_saliency.so.405
+lib/libopencv_saliency.so.406
%%EIGEN%%lib/libopencv_sfm.so
%%EIGEN%%lib/libopencv_sfm.so.%%SHLIB_VER%%
-%%EIGEN%%lib/libopencv_sfm.so.405
+%%EIGEN%%lib/libopencv_sfm.so.406
lib/libopencv_shape.so
lib/libopencv_shape.so.%%SHLIB_VER%%
-lib/libopencv_shape.so.405
+lib/libopencv_shape.so.406
lib/libopencv_stereo.so
lib/libopencv_stereo.so.%%SHLIB_VER%%
-lib/libopencv_stereo.so.405
+lib/libopencv_stereo.so.406
lib/libopencv_stitching.so
lib/libopencv_stitching.so.%%SHLIB_VER%%
-lib/libopencv_stitching.so.405
+lib/libopencv_stitching.so.406
lib/libopencv_structured_light.so
lib/libopencv_structured_light.so.%%SHLIB_VER%%
-lib/libopencv_structured_light.so.405
+lib/libopencv_structured_light.so.406
lib/libopencv_superres.so
lib/libopencv_superres.so.%%SHLIB_VER%%
-lib/libopencv_superres.so.405
+lib/libopencv_superres.so.406
lib/libopencv_surface_matching.so
lib/libopencv_surface_matching.so.%%SHLIB_VER%%
-lib/libopencv_surface_matching.so.405
+lib/libopencv_surface_matching.so.406
%%PROTOBUF%%lib/libopencv_text.so
%%PROTOBUF%%lib/libopencv_text.so.%%SHLIB_VER%%
-%%PROTOBUF%%lib/libopencv_text.so.405
+%%PROTOBUF%%lib/libopencv_text.so.406
lib/libopencv_tracking.so
lib/libopencv_tracking.so.%%SHLIB_VER%%
-lib/libopencv_tracking.so.405
+lib/libopencv_tracking.so.406
lib/libopencv_video.so
lib/libopencv_video.so.%%SHLIB_VER%%
-lib/libopencv_video.so.405
+lib/libopencv_video.so.406
lib/libopencv_videoio.so
lib/libopencv_videoio.so.%%SHLIB_VER%%
-lib/libopencv_videoio.so.405
+lib/libopencv_videoio.so.406
lib/libopencv_videostab.so
lib/libopencv_videostab.so.%%SHLIB_VER%%
-lib/libopencv_videostab.so.405
+lib/libopencv_videostab.so.406
%%VTK%%lib/libopencv_viz.so
%%VTK%%lib/libopencv_viz.so.%%SHLIB_VER%%
-%%VTK%%lib/libopencv_viz.so.405
+%%VTK%%lib/libopencv_viz.so.406
%%PROTOBUF%%lib/libopencv_wechat_qrcode.so
%%PROTOBUF%%lib/libopencv_wechat_qrcode.so.%%SHLIB_VER%%
-%%PROTOBUF%%lib/libopencv_wechat_qrcode.so.405
+%%PROTOBUF%%lib/libopencv_wechat_qrcode.so.406
lib/libopencv_xfeatures2d.so
lib/libopencv_xfeatures2d.so.%%SHLIB_VER%%
-lib/libopencv_xfeatures2d.so.405
+lib/libopencv_xfeatures2d.so.406
lib/libopencv_ximgproc.so
lib/libopencv_ximgproc.so.%%SHLIB_VER%%
-lib/libopencv_ximgproc.so.405
+lib/libopencv_ximgproc.so.406
lib/libopencv_xobjdetect.so
lib/libopencv_xobjdetect.so.%%SHLIB_VER%%
-lib/libopencv_xobjdetect.so.405
+lib/libopencv_xobjdetect.so.406
lib/libopencv_xphoto.so
lib/libopencv_xphoto.so.%%SHLIB_VER%%
-lib/libopencv_xphoto.so.405
+lib/libopencv_xphoto.so.406
%%EIGEN%%lib/opencv4/3rdparty/libcorrespondence.a
%%EIGEN%%lib/opencv4/3rdparty/libmultiview.a
%%EIGEN%%lib/opencv4/3rdparty/libnumeric.a
@@ -778,5 +782,5 @@ libdata/pkgconfig/opencv4.pc
%%DATADIR%%/quality/brisque_range_live.yml
%%DATADIR%%/valgrind.supp
%%DATADIR%%/valgrind_3rdparty.supp
-%%JAVA%%%%JAVASHAREDIR%%/opencv4/libopencv_java455.so
-%%JAVA%%%%JAVASHAREDIR%%/opencv4/opencv-455.jar
+%%JAVA%%%%JAVASHAREDIR%%/opencv4/libopencv_java460.so
+%%JAVA%%%%JAVASHAREDIR%%/opencv4/opencv-460.jar