Attachment 247315 Details for Bug 275977 – patch

[patch] patch

opencv.patch (text/plain), 23.86 KB, created by Yuri Victorovich on 2023-12-28 10:17:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2023-12-28 10:17:46 UTC

Size: 23.86 KB

patch

obsolete

>diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
>index 92dd1d81cbe6..56019e633b35 100644
>--- a/graphics/opencv/Makefile
>+++ b/graphics/opencv/Makefile
>@@ -1,11 +1,7 @@
> PORTNAME=	opencv
>-DISTVERSION=	4.6.0
>-PORTREVISION=	16
>+DISTVERSION=	4.9.0
> CATEGORIES=	graphics
> 
>-PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
>-PATCHFILES=	496eed950f6d0e7fd92619d47e3cec8f06e96ace.patch:-p1
>-
> MAINTAINER=	desktop@FreeBSD.org
> COMMENT=	Open Source Computer Vision library
> WWW=		https://www.opencv.org/
>@@ -36,10 +32,12 @@ GH_TAGNAME=	v0.1.1f:ade \
> 		8afa57abc8229d611c4937165d20e2a2d9fc5a12:face \
> 		a56b6ac6f030c312b2dce17430eef13aed9af274:ippicv
> 
>-CMAKE_ON=	OPENCV_GENERATE_PKGCONFIG
>+CMAKE_ON=	OPENCV_GENERATE_PKGCONFIG \
>+		OPENCV_SKIP_CMAKE_CXX_STANDARD
> CMAKE_OFF=	OPENCV_GENERATE_SETUPVARS \
> 		BUILD_opencv_python2 \
> 		BUILD_TESTS
>+CMAKE_OFF+=	WITH_OBSENSOR # linux/uvcvideo.h is included when WITH_OBSENSOR is enabled
> CMAKE_ARGS=	-DOPENCV_EXTRA_MODULES_PATH="${WRKSRC}/contrib/modules"
> 
> DATADIR=	${PREFIX}/share/${PORTNAME}4
>@@ -101,8 +99,7 @@ PATENTED_DESC=		Enable patented 2d feature detection USE AT OWN RISK
> PATENTED_CMAKE_BOOL=	OPENCV_ENABLE_NONFREE
> 
> PROTOBUF_DESC=		Enable protobuf support, builds dnn modules
>-PROTOBUF_CMAKE_BOOL=	WITH_PROTOBUF
>-PROTOBUF_LIB_DEPENDS=	libprotobuf.so:devel/protobuf
>+PROTOBUF_CMAKE_BOOL=	WITH_PROTOBUF # by default the bundled protobuf is built
> 
> PYTHON_DESC=		Enable Python Support 3.6 or greater
> PYTHON_BUILD_DEPENDS=	${PYNUMPY}
>diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
>index 35a189ff7ab3..e3d18f6f42b0 100644
>--- a/graphics/opencv/distinfo
>+++ b/graphics/opencv/distinfo
>@@ -1,10 +1,10 @@
>-TIMESTAMP = 1682799940
>-SHA256 (opencv-opencv-4.6.0_GH0.tar.gz) = 1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277
>-SIZE (opencv-opencv-4.6.0_GH0.tar.gz) = 90208971
>+TIMESTAMP = 1703737939
>+SHA256 (opencv-opencv-4.9.0_GH0.tar.gz) = ddf76f9dffd322c7c3cb1f721d0887f62d747b82059342213138dc190f28bc6c
>+SIZE (opencv-opencv-4.9.0_GH0.tar.gz) = 92788647
> SHA256 (WeChatCV-opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252_GH0.tar.gz) = 7a16ad6ca511c620c2a4cbef2c7cf1ff5c31bd530ac7b43ee2ea8481683df20a
> SIZE (WeChatCV-opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252_GH0.tar.gz) = 920403
>-SHA256 (opencv-opencv_contrib-4.6.0_GH0.tar.gz) = 1777d5fd2b59029cf537e5fd6f8aa68d707075822f90bde683fcde086f85f7a7
>-SIZE (opencv-opencv_contrib-4.6.0_GH0.tar.gz) = 59667769
>+SHA256 (opencv-opencv_contrib-4.9.0_GH0.tar.gz) = 8952c45a73b75676c522dd574229f563e43c271ae1d5bbbd26f8e2b6bc1a4dae
>+SIZE (opencv-opencv_contrib-4.9.0_GH0.tar.gz) = 59803362
> 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_OpenCVFindLibsGrfmt.cmake b/graphics/opencv/files/patch-cmake_OpenCVFindLibsGrfmt.cmake
>deleted file mode 100644
>index 6371feb89063..000000000000
>--- a/graphics/opencv/files/patch-cmake_OpenCVFindLibsGrfmt.cmake
>+++ /dev/null
>@@ -1,14 +0,0 @@
>---- cmake/OpenCVFindLibsGrfmt.cmake.orig	2022-06-05 15:32:44 UTC
>-+++ cmake/OpenCVFindLibsGrfmt.cmake
>-@@ -230,9 +230,9 @@ if(WITH_PNG)
>-     include(FindPNG)
>-     if(PNG_FOUND)
>-       include(CheckIncludeFile)
>--      check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H)
>-+      check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng16/png.h" HAVE_LIBPNG_PNG_H)
>-       if(HAVE_LIBPNG_PNG_H)
>--        ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE)
>-+        ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/libpng16/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE)
>-       else()
>-         ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE)
>-       endif()
>diff --git a/graphics/opencv/files/patch-contrib_modules_sfm_src_libmv__light_libmv_numeric_numeric.h b/graphics/opencv/files/patch-contrib_modules_sfm_src_libmv__light_libmv_numeric_numeric.h
>index 47f4a8c59730..bcd147a49436 100644
>--- a/graphics/opencv/files/patch-contrib_modules_sfm_src_libmv__light_libmv_numeric_numeric.h
>+++ b/graphics/opencv/files/patch-contrib_modules_sfm_src_libmv__light_libmv_numeric_numeric.h
>@@ -1,8 +1,8 @@
>---- contrib/modules/sfm/src/libmv_light/libmv/numeric/numeric.h.orig	2021-01-30 07:20:50 UTC
>+--- contrib/modules/sfm/src/libmv_light/libmv/numeric/numeric.h.orig	2023-12-26 21:24:58 UTC
> +++ contrib/modules/sfm/src/libmv_light/libmv/numeric/numeric.h
>-@@ -35,7 +35,7 @@
>+@@ -36,7 +36,7 @@
>  
>- #if !defined(__MINGW64__)
>+ #if !defined(__MINGW32__)
>  #  if defined(_WIN32) || defined(__APPLE__) || \
> -      defined(__FreeBSD__) || defined(__NetBSD__)
> +      defined(__NetBSD__)
>diff --git a/graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake b/graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake
>index 45fcc5ea32ec..7643e2a237c4 100644
>--- a/graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake
>+++ b/graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake
>@@ -1,12 +1,12 @@
> The ade distdata is downloaded and moved to the proper location by the ports 
> framework.
> 
>---- modules/gapi/cmake/DownloadADE.cmake.orig	2021-07-05 12:03:22 UTC
>+--- modules/gapi/cmake/DownloadADE.cmake.orig	2023-12-27 16:46:55 UTC
> +++ modules/gapi/cmake/DownloadADE.cmake
>-@@ -2,22 +2,18 @@ set(ade_src_dir "${OpenCV_BINARY_DIR}/3rdparty/ade")
>- set(ade_filename "v0.1.1f.zip")
>- set(ade_subdir "ade-0.1.1f")
>- set(ade_md5 "b624b995ec9c439cbc2e9e6ee940d3a2")
>+@@ -2,18 +2,12 @@ set(ade_md5 "dbb095a8bf3008e91edbbf45d8d34885")
>+ set(ade_filename "v0.1.2d.zip")
>+ set(ade_subdir "ade-0.1.2d")
>+ set(ade_md5 "dbb095a8bf3008e91edbbf45d8d34885")
> -ocv_download(FILENAME ${ade_filename}
> -             HASH ${ade_md5}
> -             URL
>@@ -17,20 +17,14 @@ framework.
> -             ID ADE
> -             STATUS res
> -             UNPACK RELATIVE_URL)
>- 
>+-
> -if (NOT res)
>-+set(file_id ade-0.1.1f/CMakeLists.txt)
>++set(file_id ade-0.1.2d/CMakeLists.txt)
> +set(FILENAME ${ade_src_dir}/${file_id})
> +if(EXISTS ${FILENAME})
> +    message("++ ade: Using prefetched ${file_id}")
> +else()
> +    message(WARNING "++ ade: Could not find ${file_id} in ${FILENAME}")
>      return()
>--endif()
>-+ endif()
>+ endif()
>  
>- set(ADE_root "${ade_src_dir}/${ade_subdir}/sources/ade")
>-+
>- file(GLOB_RECURSE ADE_sources "${ADE_root}/source/*.cpp")
>- file(GLOB_RECURSE ADE_include "${ADE_root}/include/ade/*.hpp")
>- add_library(ade STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL}
>diff --git a/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__png.cpp b/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__png.cpp
>deleted file mode 100644
>index 1ded70237237..000000000000
>--- a/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__png.cpp
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- modules/imgcodecs/src/grfmt_png.cpp.orig	2021-07-18 11:13:32 UTC
>-+++ modules/imgcodecs/src/grfmt_png.cpp
>-@@ -59,7 +59,7 @@
>- #endif
>- 
>- #ifdef HAVE_LIBPNG_PNG_H
>--#include <libpng/png.h>
>-+#include <libpng16/png.h>
>- #else
>- #include <png.h>
>- #endif
>diff --git a/graphics/opencv/pkg-plist b/graphics/opencv/pkg-plist
>index f4e2fa75cf25..cbfc7246738b 100644
>--- a/graphics/opencv/pkg-plist
>+++ b/graphics/opencv/pkg-plist
>@@ -6,9 +6,8 @@ bin/opencv_visualisation
> bin/opencv_waldboost_detector
> %%EIGEN%%include/opencv4/opencv2/alphamat.hpp
> include/opencv4/opencv2/aruco.hpp
>+include/opencv4/opencv2/aruco/aruco_calib.hpp
> include/opencv4/opencv2/aruco/charuco.hpp
>-include/opencv4/opencv2/aruco/dictionary.hpp
>-%%PROTOBUF%%include/opencv4/opencv2/barcode.hpp
> include/opencv4/opencv2/bgsegm.hpp
> include/opencv4/opencv2/bioinspired.hpp
> include/opencv4/opencv2/bioinspired/bioinspired.hpp
>@@ -86,10 +85,17 @@ include/opencv4/opencv2/core/hal/intrin_avx.hpp
> include/opencv4/opencv2/core/hal/intrin_avx512.hpp
> include/opencv4/opencv2/core/hal/intrin_cpp.hpp
> include/opencv4/opencv2/core/hal/intrin_forward.hpp
>+include/opencv4/opencv2/core/hal/intrin_lasx.hpp
>+include/opencv4/opencv2/core/hal/intrin_lsx.hpp
> include/opencv4/opencv2/core/hal/intrin_msa.hpp
> include/opencv4/opencv2/core/hal/intrin_neon.hpp
> include/opencv4/opencv2/core/hal/intrin_rvv.hpp
> include/opencv4/opencv2/core/hal/intrin_rvv071.hpp
>+include/opencv4/opencv2/core/hal/intrin_rvv_010_compat_non-policy.hpp
>+include/opencv4/opencv2/core/hal/intrin_rvv_010_compat_overloaded-non-policy.hpp
>+include/opencv4/opencv2/core/hal/intrin_rvv_011_compat.hpp
>+include/opencv4/opencv2/core/hal/intrin_rvv_compat_overloaded.hpp
>+include/opencv4/opencv2/core/hal/intrin_rvv_scalable.hpp
> include/opencv4/opencv2/core/hal/intrin_sse.hpp
> include/opencv4/opencv2/core/hal/intrin_sse_em.hpp
> include/opencv4/opencv2/core/hal/intrin_vsx.hpp
>@@ -254,96 +260,6 @@ include/opencv4/opencv2/fuzzy/fuzzy_F0_math.hpp
> include/opencv4/opencv2/fuzzy/fuzzy_F1_math.hpp
> include/opencv4/opencv2/fuzzy/fuzzy_image.hpp
> include/opencv4/opencv2/fuzzy/types.hpp
>-include/opencv4/opencv2/gapi.hpp
>-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
>-include/opencv4/opencv2/gapi/fluid/gfluidkernel.hpp
>-include/opencv4/opencv2/gapi/fluid/imgproc.hpp
>-include/opencv4/opencv2/gapi/garg.hpp
>-include/opencv4/opencv2/gapi/garray.hpp
>-include/opencv4/opencv2/gapi/gasync_context.hpp
>-include/opencv4/opencv2/gapi/gcall.hpp
>-include/opencv4/opencv2/gapi/gcommon.hpp
>-include/opencv4/opencv2/gapi/gcompiled.hpp
>-include/opencv4/opencv2/gapi/gcompiled_async.hpp
>-include/opencv4/opencv2/gapi/gcompoundkernel.hpp
>-include/opencv4/opencv2/gapi/gcomputation.hpp
>-include/opencv4/opencv2/gapi/gcomputation_async.hpp
>-include/opencv4/opencv2/gapi/gframe.hpp
>-include/opencv4/opencv2/gapi/gkernel.hpp
>-include/opencv4/opencv2/gapi/gmat.hpp
>-include/opencv4/opencv2/gapi/gmetaarg.hpp
>-include/opencv4/opencv2/gapi/gopaque.hpp
>-include/opencv4/opencv2/gapi/gproto.hpp
>-include/opencv4/opencv2/gapi/gpu/core.hpp
>-include/opencv4/opencv2/gapi/gpu/ggpukernel.hpp
>-include/opencv4/opencv2/gapi/gpu/imgproc.hpp
>-include/opencv4/opencv2/gapi/gscalar.hpp
>-include/opencv4/opencv2/gapi/gstreaming.hpp
>-include/opencv4/opencv2/gapi/gtransform.hpp
>-include/opencv4/opencv2/gapi/gtype_traits.hpp
>-include/opencv4/opencv2/gapi/gtyped.hpp
>-include/opencv4/opencv2/gapi/imgproc.hpp
>-include/opencv4/opencv2/gapi/infer.hpp
>-include/opencv4/opencv2/gapi/infer/bindings_ie.hpp
>-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
>-include/opencv4/opencv2/gapi/opencv_includes.hpp
>-include/opencv4/opencv2/gapi/operators.hpp
>-include/opencv4/opencv2/gapi/own/assert.hpp
>-include/opencv4/opencv2/gapi/own/convert.hpp
>-include/opencv4/opencv2/gapi/own/cvdefs.hpp
>-include/opencv4/opencv2/gapi/own/exports.hpp
>-include/opencv4/opencv2/gapi/own/mat.hpp
>-include/opencv4/opencv2/gapi/own/saturate.hpp
>-include/opencv4/opencv2/gapi/own/scalar.hpp
>-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/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
>-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
>-include/opencv4/opencv2/gapi/util/compiler_hints.hpp
>-include/opencv4/opencv2/gapi/util/copy_through_move.hpp
>-include/opencv4/opencv2/gapi/util/optional.hpp
>-include/opencv4/opencv2/gapi/util/throw.hpp
>-include/opencv4/opencv2/gapi/util/type_traits.hpp
>-include/opencv4/opencv2/gapi/util/util.hpp
>-include/opencv4/opencv2/gapi/util/variant.hpp
>-include/opencv4/opencv2/gapi/video.hpp
> include/opencv4/opencv2/hdf.hpp
> include/opencv4/opencv2/hdf/hdf5.hpp
> include/opencv4/opencv2/hfs.hpp
>@@ -384,8 +300,14 @@ include/opencv4/opencv2/ml.hpp
> include/opencv4/opencv2/ml/ml.hpp
> include/opencv4/opencv2/ml/ml.inl.hpp
> include/opencv4/opencv2/objdetect.hpp
>+include/opencv4/opencv2/objdetect/aruco_board.hpp
>+include/opencv4/opencv2/objdetect/aruco_detector.hpp
>+include/opencv4/opencv2/objdetect/aruco_dictionary.hpp
>+include/opencv4/opencv2/objdetect/barcode.hpp
>+include/opencv4/opencv2/objdetect/charuco_detector.hpp
> include/opencv4/opencv2/objdetect/detection_based_tracker.hpp
> include/opencv4/opencv2/objdetect/face.hpp
>+include/opencv4/opencv2/objdetect/graphical_code_detector.hpp
> include/opencv4/opencv2/objdetect/objdetect.hpp
> include/opencv4/opencv2/opencv.hpp
> include/opencv4/opencv2/opencv_modules.hpp
>@@ -544,6 +466,7 @@ include/opencv4/opencv2/ximgproc/edgepreserving_filter.hpp
> include/opencv4/opencv2/ximgproc/estimated_covariance.hpp
> include/opencv4/opencv2/ximgproc/fast_hough_transform.hpp
> include/opencv4/opencv2/ximgproc/fast_line_detector.hpp
>+include/opencv4/opencv2/ximgproc/find_ellipses.hpp
> include/opencv4/opencv2/ximgproc/fourier_descriptors.hpp
> include/opencv4/opencv2/ximgproc/lsc.hpp
> include/opencv4/opencv2/ximgproc/paillou_filter.hpp
>@@ -572,182 +495,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.406
>+%%EIGEN%%lib/libopencv_alphamat.so.409
> lib/libopencv_aruco.so
> lib/libopencv_aruco.so.%%SHLIB_VER%%
>-lib/libopencv_aruco.so.406
>-%%PROTOBUF%%lib/libopencv_barcode.so
>-%%PROTOBUF%%lib/libopencv_barcode.so.%%SHLIB_VER%%
>-%%PROTOBUF%%lib/libopencv_barcode.so.406
>+lib/libopencv_aruco.so.409
> lib/libopencv_bgsegm.so
> lib/libopencv_bgsegm.so.%%SHLIB_VER%%
>-lib/libopencv_bgsegm.so.406
>+lib/libopencv_bgsegm.so.409
> lib/libopencv_bioinspired.so
> lib/libopencv_bioinspired.so.%%SHLIB_VER%%
>-lib/libopencv_bioinspired.so.406
>+lib/libopencv_bioinspired.so.409
> lib/libopencv_calib3d.so
> lib/libopencv_calib3d.so.%%SHLIB_VER%%
>-lib/libopencv_calib3d.so.406
>+lib/libopencv_calib3d.so.409
> lib/libopencv_ccalib.so
> lib/libopencv_ccalib.so.%%SHLIB_VER%%
>-lib/libopencv_ccalib.so.406
>+lib/libopencv_ccalib.so.409
> lib/libopencv_core.so
> lib/libopencv_core.so.%%SHLIB_VER%%
>-lib/libopencv_core.so.406
>+lib/libopencv_core.so.409
> lib/libopencv_datasets.so
> lib/libopencv_datasets.so.%%SHLIB_VER%%
>-lib/libopencv_datasets.so.406
>+lib/libopencv_datasets.so.409
> %%PROTOBUF%%lib/libopencv_dnn.so
> %%PROTOBUF%%lib/libopencv_dnn.so.%%SHLIB_VER%%
>-%%PROTOBUF%%lib/libopencv_dnn.so.406
>+%%PROTOBUF%%lib/libopencv_dnn.so.409
> %%PROTOBUF%%lib/libopencv_dnn_objdetect.so
> %%PROTOBUF%%lib/libopencv_dnn_objdetect.so.%%SHLIB_VER%%
>-%%PROTOBUF%%lib/libopencv_dnn_objdetect.so.406
>+%%PROTOBUF%%lib/libopencv_dnn_objdetect.so.409
> %%PROTOBUF%%lib/libopencv_dnn_superres.so
> %%PROTOBUF%%lib/libopencv_dnn_superres.so.%%SHLIB_VER%%
>-%%PROTOBUF%%lib/libopencv_dnn_superres.so.406
>+%%PROTOBUF%%lib/libopencv_dnn_superres.so.409
> lib/libopencv_dpm.so
> lib/libopencv_dpm.so.%%SHLIB_VER%%
>-lib/libopencv_dpm.so.406
>+lib/libopencv_dpm.so.409
> lib/libopencv_face.so
> lib/libopencv_face.so.%%SHLIB_VER%%
>-lib/libopencv_face.so.406
>+lib/libopencv_face.so.409
> lib/libopencv_features2d.so
> lib/libopencv_features2d.so.%%SHLIB_VER%%
>-lib/libopencv_features2d.so.406
>+lib/libopencv_features2d.so.409
> lib/libopencv_flann.so
> lib/libopencv_flann.so.%%SHLIB_VER%%
>-lib/libopencv_flann.so.406
>+lib/libopencv_flann.so.409
> lib/libopencv_freetype.so
> lib/libopencv_freetype.so.%%SHLIB_VER%%
>-lib/libopencv_freetype.so.406
>+lib/libopencv_freetype.so.409
> lib/libopencv_fuzzy.so
> lib/libopencv_fuzzy.so.%%SHLIB_VER%%
>-lib/libopencv_fuzzy.so.406
>-lib/libopencv_gapi.so
>-lib/libopencv_gapi.so.%%SHLIB_VER%%
>-lib/libopencv_gapi.so.406
>+lib/libopencv_fuzzy.so.409
> lib/libopencv_hdf.so
> lib/libopencv_hdf.so.%%SHLIB_VER%%
>-lib/libopencv_hdf.so.406
>+lib/libopencv_hdf.so.409
> lib/libopencv_hfs.so
> lib/libopencv_hfs.so.%%SHLIB_VER%%
>-lib/libopencv_hfs.so.406
>+lib/libopencv_hfs.so.409
> lib/libopencv_highgui.so
> lib/libopencv_highgui.so.%%SHLIB_VER%%
>-lib/libopencv_highgui.so.406
>+lib/libopencv_highgui.so.409
> lib/libopencv_img_hash.so
> lib/libopencv_img_hash.so.%%SHLIB_VER%%
>-lib/libopencv_img_hash.so.406
>+lib/libopencv_img_hash.so.409
> lib/libopencv_imgcodecs.so
> lib/libopencv_imgcodecs.so.%%SHLIB_VER%%
>-lib/libopencv_imgcodecs.so.406
>+lib/libopencv_imgcodecs.so.409
> lib/libopencv_imgproc.so
> lib/libopencv_imgproc.so.%%SHLIB_VER%%
>-lib/libopencv_imgproc.so.406
>+lib/libopencv_imgproc.so.409
> lib/libopencv_intensity_transform.so
> lib/libopencv_intensity_transform.so.%%SHLIB_VER%%
>-lib/libopencv_intensity_transform.so.406
>+lib/libopencv_intensity_transform.so.409
> lib/libopencv_line_descriptor.so
> lib/libopencv_line_descriptor.so.%%SHLIB_VER%%
>-lib/libopencv_line_descriptor.so.406
>+lib/libopencv_line_descriptor.so.409
> %%PROTOBUF%%lib/libopencv_mcc.so
> %%PROTOBUF%%lib/libopencv_mcc.so.%%SHLIB_VER%%
>-%%PROTOBUF%%lib/libopencv_mcc.so.406
>+%%PROTOBUF%%lib/libopencv_mcc.so.409
> lib/libopencv_ml.so
> lib/libopencv_ml.so.%%SHLIB_VER%%
>-lib/libopencv_ml.so.406
>+lib/libopencv_ml.so.409
> lib/libopencv_objdetect.so
> lib/libopencv_objdetect.so.%%SHLIB_VER%%
>-lib/libopencv_objdetect.so.406
>+lib/libopencv_objdetect.so.409
> lib/libopencv_optflow.so
> lib/libopencv_optflow.so.%%SHLIB_VER%%
>-lib/libopencv_optflow.so.406
>+lib/libopencv_optflow.so.409
> lib/libopencv_phase_unwrapping.so
> lib/libopencv_phase_unwrapping.so.%%SHLIB_VER%%
>-lib/libopencv_phase_unwrapping.so.406
>+lib/libopencv_phase_unwrapping.so.409
> lib/libopencv_photo.so
> lib/libopencv_photo.so.%%SHLIB_VER%%
>-lib/libopencv_photo.so.406
>+lib/libopencv_photo.so.409
> lib/libopencv_plot.so
> lib/libopencv_plot.so.%%SHLIB_VER%%
>-lib/libopencv_plot.so.406
>+lib/libopencv_plot.so.409
> lib/libopencv_quality.so
> lib/libopencv_quality.so.%%SHLIB_VER%%
>-lib/libopencv_quality.so.406
>+lib/libopencv_quality.so.409
> lib/libopencv_rapid.so
> lib/libopencv_rapid.so.%%SHLIB_VER%%
>-lib/libopencv_rapid.so.406
>+lib/libopencv_rapid.so.409
> lib/libopencv_reg.so
> lib/libopencv_reg.so.%%SHLIB_VER%%
>-lib/libopencv_reg.so.406
>+lib/libopencv_reg.so.409
> lib/libopencv_rgbd.so
> lib/libopencv_rgbd.so.%%SHLIB_VER%%
>-lib/libopencv_rgbd.so.406
>+lib/libopencv_rgbd.so.409
> lib/libopencv_saliency.so
> lib/libopencv_saliency.so.%%SHLIB_VER%%
>-lib/libopencv_saliency.so.406
>+lib/libopencv_saliency.so.409
> %%EIGEN%%lib/libopencv_sfm.so
> %%EIGEN%%lib/libopencv_sfm.so.%%SHLIB_VER%%
>-%%EIGEN%%lib/libopencv_sfm.so.406
>+%%EIGEN%%lib/libopencv_sfm.so.409
> lib/libopencv_shape.so
> lib/libopencv_shape.so.%%SHLIB_VER%%
>-lib/libopencv_shape.so.406
>+lib/libopencv_shape.so.409
> lib/libopencv_stereo.so
> lib/libopencv_stereo.so.%%SHLIB_VER%%
>-lib/libopencv_stereo.so.406
>+lib/libopencv_stereo.so.409
> lib/libopencv_stitching.so
> lib/libopencv_stitching.so.%%SHLIB_VER%%
>-lib/libopencv_stitching.so.406
>+lib/libopencv_stitching.so.409
> lib/libopencv_structured_light.so
> lib/libopencv_structured_light.so.%%SHLIB_VER%%
>-lib/libopencv_structured_light.so.406
>+lib/libopencv_structured_light.so.409
> lib/libopencv_superres.so
> lib/libopencv_superres.so.%%SHLIB_VER%%
>-lib/libopencv_superres.so.406
>+lib/libopencv_superres.so.409
> lib/libopencv_surface_matching.so
> lib/libopencv_surface_matching.so.%%SHLIB_VER%%
>-lib/libopencv_surface_matching.so.406
>+lib/libopencv_surface_matching.so.409
> %%PROTOBUF%%lib/libopencv_text.so
> %%PROTOBUF%%lib/libopencv_text.so.%%SHLIB_VER%%
>-%%PROTOBUF%%lib/libopencv_text.so.406
>+%%PROTOBUF%%lib/libopencv_text.so.409
> lib/libopencv_tracking.so
> lib/libopencv_tracking.so.%%SHLIB_VER%%
>-lib/libopencv_tracking.so.406
>+lib/libopencv_tracking.so.409
> lib/libopencv_video.so
> lib/libopencv_video.so.%%SHLIB_VER%%
>-lib/libopencv_video.so.406
>+lib/libopencv_video.so.409
> lib/libopencv_videoio.so
> lib/libopencv_videoio.so.%%SHLIB_VER%%
>-lib/libopencv_videoio.so.406
>+lib/libopencv_videoio.so.409
> lib/libopencv_videostab.so
> lib/libopencv_videostab.so.%%SHLIB_VER%%
>-lib/libopencv_videostab.so.406
>+lib/libopencv_videostab.so.409
> %%VTK%%lib/libopencv_viz.so
> %%VTK%%lib/libopencv_viz.so.%%SHLIB_VER%%
>-%%VTK%%lib/libopencv_viz.so.406
>+%%VTK%%lib/libopencv_viz.so.409
> %%PROTOBUF%%lib/libopencv_wechat_qrcode.so
> %%PROTOBUF%%lib/libopencv_wechat_qrcode.so.%%SHLIB_VER%%
>-%%PROTOBUF%%lib/libopencv_wechat_qrcode.so.406
>+%%PROTOBUF%%lib/libopencv_wechat_qrcode.so.409
> lib/libopencv_xfeatures2d.so
> lib/libopencv_xfeatures2d.so.%%SHLIB_VER%%
>-lib/libopencv_xfeatures2d.so.406
>+lib/libopencv_xfeatures2d.so.409
> lib/libopencv_ximgproc.so
> lib/libopencv_ximgproc.so.%%SHLIB_VER%%
>-lib/libopencv_ximgproc.so.406
>+lib/libopencv_ximgproc.so.409
> lib/libopencv_xobjdetect.so
> lib/libopencv_xobjdetect.so.%%SHLIB_VER%%
>-lib/libopencv_xobjdetect.so.406
>+lib/libopencv_xobjdetect.so.409
> lib/libopencv_xphoto.so
> lib/libopencv_xphoto.so.%%SHLIB_VER%%
>-lib/libopencv_xphoto.so.406
>+lib/libopencv_xphoto.so.409
> %%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
>@@ -756,6 +672,8 @@ lib/libopencv_xphoto.so.406
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/python-%%PYTHON_VER%%/cv2%%PYTHON_EXT_SUFFIX%%.so
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/utils/__init__.py
> libdata/pkgconfig/opencv4.pc
>+%%JAVA%%%%JAVASHAREDIR%%/opencv4/libopencv_java490.so
>+%%JAVA%%%%JAVASHAREDIR%%/opencv4/opencv-490.jar
> %%DATADIR%%/haarcascades/haarcascade_eye.xml
> %%DATADIR%%/haarcascades/haarcascade_eye_tree_eyeglasses.xml
> %%DATADIR%%/haarcascades/haarcascade_frontalcatface.xml
>@@ -766,7 +684,7 @@ libdata/pkgconfig/opencv4.pc
> %%DATADIR%%/haarcascades/haarcascade_frontalface_default.xml
> %%DATADIR%%/haarcascades/haarcascade_fullbody.xml
> %%DATADIR%%/haarcascades/haarcascade_lefteye_2splits.xml
>-%%DATADIR%%/haarcascades/haarcascade_licence_plate_rus_16stages.xml
>+%%DATADIR%%/haarcascades/haarcascade_license_plate_rus_16stages.xml
> %%DATADIR%%/haarcascades/haarcascade_lowerbody.xml
> %%DATADIR%%/haarcascades/haarcascade_profileface.xml
> %%DATADIR%%/haarcascades/haarcascade_righteye_2splits.xml
>@@ -782,5 +700,4 @@ libdata/pkgconfig/opencv4.pc
> %%DATADIR%%/quality/brisque_range_live.yml
> %%DATADIR%%/valgrind.supp
> %%DATADIR%%/valgrind_3rdparty.supp
>-%%JAVA%%%%JAVASHAREDIR%%/opencv4/libopencv_java460.so
>-%%JAVA%%%%JAVASHAREDIR%%/opencv4/opencv-460.jar
>+%%PYTHON%%@dir %%PYTHON_SITELIBDIR%%/cv2/typing

Actions: View | Diff

Attachments on bug 275977: 247310 | 247314 | 247315