git: dbd4812caf0f - main - graphics/opencv: Update to 4.11.0

From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Wed, 21 May 2025 18:20:13 UTC 
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dbd4812caf0fd7bb757c67d76cdfc9b5481d2233

commit dbd4812caf0fd7bb757c67d76cdfc9b5481d2233
Author:     Alastair Hogge <agh@riseup.net>
AuthorDate: 2025-05-21 13:39:13 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-05-21 18:19:56 +0000

    graphics/opencv: Update to 4.11.0
    
    PR:             286423
---
 graphics/opencv/Makefile                           | 116 +++----
 graphics/opencv/distinfo                           |  28 +-
 .../patch-modules_gapi_cmake_DownloadADE.cmake     |  12 +-
 graphics/opencv/pkg-plist                          | 336 ++++++++++++++++-----
 4 files changed, 330 insertions(+), 162 deletions(-)

diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 40a3b279c16e..f032ca2704cb 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	opencv
-DISTVERSION=	4.9.0
-PORTREVISION=	7
+DISTVERSION=	4.11.0
 CATEGORIES=	graphics
 
 MAINTAINER=	desktop@FreeBSD.org
@@ -16,60 +15,43 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 
 USES=		cmake compiler:c++14-lang cpe gnome localbase:ldflags pkgconfig
 USE_GITHUB=	yes
-GH_ACCOUNT=	WeChatCV:wechat
-GH_PROJECT=	opencv_contrib:contrib \
-		ade:ade \
-		opencv_3rdparty:extra_mod_3rdparty_boost_descr \
-		opencv_3rdparty:extra_mod_3rdparty_vgg \
-		opencv_3rdparty:wechat \
-		opencv_3rdparty:face \
-		opencv_3rdparty:ippicv
-GH_TAGNAME=	v0.1.1f:ade \
-		34e4206aef44d50e6bbcd0ab06354b52e7466d26:extra_mod_3rdparty_boost_descr \
-		fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:extra_mod_3rdparty_vgg \
-		a8b69ccc738421293254aec5ddb38bd523503252:wechat \
-		8afa57abc8229d611c4937165d20e2a2d9fc5a12:face \
-		a56b6ac6f030c312b2dce17430eef13aed9af274:ippicv
-
-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
+GH_PROJECT=	ade:ade opencv_3rdparty:ippicv opencv_contrib:contrib
+GH_TAGNAME=	7f55c0c26be418d494615afca15218566775c725:ippicv v0.1.2e:ade
+USE_LDCONFIG=	yes
+
 CMAKE_ARGS=	-DOPENCV_EXTRA_MODULES_PATH="${WRKSRC}/contrib/modules"
+CMAKE_ON=	OPENCV_GENERATE_PKGCONFIG OPENCV_SKIP_CMAKE_CXX_STANDARD
+CMAKE_OFF=	BUILD_opencv_python2 BUILD_TESTS OPENCV_GENERATE_SETUPVARS
 
 DATADIR=	${PREFIX}/share/${PORTNAME}4
 
 PLIST_SUB=	SHLIB_VER=${DISTVERSION}
 
-OPTIONS_DEFINE=		EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL \
-			PATENTED PROTOBUF PYTHON TBB TESSERACT
+OPTIONS_DEFINE=		EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL PATENTED \
+			PROTOBUF PYTHON TBB TESSERACT
+OPTIONS_DEFAULT=	DC1394 EIGEN GDAL GDCM GPHOTO2 GSTREAMER JPEG OPENBLAS \
+			OPENCL OPENEXR OPENJPEG PNG PROTOBUF PYTHON TIFF V4L \
+			VULKAN WEBP
 
 OPTIONS_GROUP=		GUI IMAGE VIDEO
 OPTIONS_GROUP_GUI=	GTK3 VTK
 OPTIONS_GROUP_IMAGE=	GPHOTO2 JPEG OGRE3D OPENEXR PNG TIFF
-OPTIONS_GROUP_VIDEO=	DC1394 FFMPEG GSTREAMER V4L VULKAN WEBP XINE
-
-OPTIONS_SINGLE=		BLAS
-OPTIONS_SINGLE_BLAS=	ATLAS OPENBLAS NOBLAS
+OPTIONS_GROUP_VIDEO=	DC1394 FFMPEG GSTREAMER OBSENSOR V4L VULKAN WEBP XINE
 
 OPTIONS_RADIO=		JPEG2K
 OPTIONS_RADIO_JPEG2K=	JASPER OPENJPEG
 
-OPTIONS_DEFAULT=	EIGEN GDAL GDCM OPENCL PROTOBUF PYTHON \
-			DC1394 GSTREAMER V4L VULKAN WEBP \
-			GPHOTO2 JPEG OPENEXR PNG TIFF \
-			OPENBLAS \
-			OPENJPEG
-OPTIONS_SUB=		yes
+OPTIONS_SINGLE=		BLAS
+OPTIONS_SINGLE_BLAS=	ATLAS NOBLAS OPENBLAS
+
+OPTIONS_SUB=	yes
 
 # Normal options (EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL PATENTED PROTOBUF PYTHON TBB)
 EIGEN_DESC=		Add Eigen v3 Support, builds sfm modules
 EIGEN_CMAKE_BOOL=	WITH_EIGEN
-EIGEN_LIB_DEPENDS=	libgflags.so:devel/gflags \
-			libglog.so:devel/glog \
-			libceres.so:math/ceres-solver
+EIGEN_LIB_DEPENDS=	libceres.so:math/ceres-solver \
+			libgflags.so:devel/gflags \
+			libglog.so:devel/glog
 EIGEN_USES=		eigen:3
 
 GDAL_DESC=		Add Geospatial Data Abstraction Library Support
@@ -85,12 +67,13 @@ HARDENING_CMAKE_BOOL=	ENABLE_BUILD_HARDENING
 
 JAVA_DESC=		Enable Java Support
 JAVA_BUILD_DEPENDS=	ant:devel/apache-ant
-JAVA_CMAKE_BOOL=	BUILD_opencv_java BUILD_opencv_java_bindings_generator BUILD_JAVA
+JAVA_CMAKE_BOOL=	BUILD_JAVA BUILD_opencv_java \
+			BUILD_opencv_java_bindings_generator
 JAVA_MAKE_ENV=		JAVACMD=${JAVA}
 JAVA_USES=		java
 
-LTO_DESC=		Enables Link Time Optimizations
-LTO_CMAKE_BOOL=		ENABLE_THIN_LTO
+LTO_DESC=	Enables Link Time Optimizations
+LTO_CMAKE_BOOL=	ENABLE_THIN_LTO
 
 OPENCL_DESC=		Add OpenCL Support
 OPENCL_CMAKE_BOOL=	WITH_OPENCL
@@ -104,8 +87,8 @@ PROTOBUF_DESC=		Enable protobuf support, builds dnn modules
 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}
-PYTHON_RUN_DEPENDS=	${PYNUMPY}
+PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR}
+PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR}
 PYTHON_USES=		python
 PYTHON_CMAKE_BOOL=	BUILD_opencv_python3
 PYTHON_CMAKE_ON=	-DOPENCV_PYTHON3_INSTALL_PATH=${PYTHON_SITELIBDIR}
@@ -120,7 +103,7 @@ TESSERACT_CMAKE_BOOL=	WITH_TESSERACT
 ###
 
 # GUI group options (GTK3 VTK)
-GTK3_USE=		gnome=gtk30,cairo,gdkpixbuf
+GTK3_USE=		cairo,gdkpixbuf,gnome=gtk30
 GTK3_CMAKE_BOOL=	WITH_GTK
 
 VTK_DESC=		Include VTK library support (build opencv_viz module)
@@ -168,10 +151,14 @@ FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 GSTREAMER_DESC=		Add GSTREAMER Support
 GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER
 GSTREAMER_USES=		gstreamer
-GSTREAMER_USE=		gnome=glib20
+GSTREAMER_USE=		GNOME=glib20
+
+OBSENSOR_DESC=		Orbbec 3D camera support
+OBSENSOR_CMAKE_BOOL=	WITH_OBSENSOR
+OBSENSOR_IMPLIES=	V4L
 
 V4L_DESC=		Enable support for Video for Linux
-V4L_CMAKE_BOOL=		WITH_V4L WITH_LIBV4L
+V4L_CMAKE_BOOL=		WITH_LIBV4L WITH_V4L
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
@@ -214,40 +201,35 @@ OPENJPEG_CMAKE_BOOL=	WITH_OPENJPEG
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 ###
 
-_IPPICV_i386=		ippicv/ippicv_2020_lnx_ia32_20191018_general.tgz
-_IPPICV_amd64=		ippicv/ippicv_2020_lnx_intel64_20191018_general.tgz
+_IPPICV_amd64=	ippicv/ippicv_2021.12.0_lnx_intel64_20240425_general.tgz
+_IPPICV_i386=	ippicv/ippicv_2021.12.0_lnx_ia32_20240425_general.tgz
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64le && defined(MACHINE_CPU) && ${MACHINE_CPU:Mvsx3}
-CMAKE_ARGS+=		-DCPU_BASELINE:STRING="VSX;VSX3;"
+CMAKE_ARGS+=	-DCPU_BASELINE:STRING="VSX;VSX3;"
 .endif
 
 post-extract:
-	# Handle contrib
-	${MV} ${WRKSRC_contrib} ${WRKSRC}/contrib
-	# Handle prefetched ade modul
+# Handle contrib
+	${MV} ${WRKSRC_contrib} \
+		${WRKSRC}/contrib
+# Handle prefetched ade modul
 	${MKDIR} ${BUILD_WRKSRC}/3rdparty/ade
-	${MV} ${WRKSRC_ade} ${BUILD_WRKSRC}/3rdparty/ade
-	# Handle prefetched xfeatures2d
-	${MKDIR} ${BUILD_WRKSRC}/downloads/xfeatures2d
-	${CP} ${WRKSRC_extra_mod_3rdparty_boost_descr}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
-	${CP} ${WRKSRC_extra_mod_3rdparty_vgg}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
-	# Handle prefetched wechat
-	${MKDIR} ${BUILD_WRKSRC}/downloads/wechat_qrcode
-	${CP} ${WRKSRC_wechat}/* ${BUILD_WRKSRC}/downloads/wechat_qrcode/
-	# Handle Face
-	${MKDIR} ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face
-	${CP} ${WRKSRC_face}/* ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face
-	# Handle ippicv
+	${MV} ${WRKSRC_ade} \
+		${BUILD_WRKSRC}/3rdparty/ade
+# Handle ippicv
 .if defined(_IPPICV_${ARCH})
 	${MKDIR} ${BUILD_WRKSRC}/3rdparty/ippicv
-	(cd ${BUILD_WRKSRC}/3rdparty/ippicv && ${EXTRACT_CMD} -xf ${WRKSRC_ippicv}/${_IPPICV_${ARCH}})
+	(cd ${BUILD_WRKSRC}/3rdparty/ippicv && \
+		${EXTRACT_CMD} -xf ${WRKSRC_ippicv}/${_IPPICV_${ARCH}})
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|/usr/lib/atlas-base|${LOCALBASE}/lib|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
-	${REINPLACE_CMD} -e 's|/usr/include/atlas|${LOCALBASE}/include|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
+	${REINPLACE_CMD} -e 's|/usr/lib/atlas-base|${LOCALBASE}/lib|g' \
+		${WRKSRC}/cmake/OpenCVFindAtlas.cmake
+	${REINPLACE_CMD} -e 's|/usr/include/atlas|${LOCALBASE}/include|g' \
+		${WRKSRC}/cmake/OpenCVFindAtlas.cmake
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
index e3d18f6f42b0..06f3f1e26fc4 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@@ -1,19 +1,9 @@
-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.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
-SIZE (opencv-opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26_GH0.tar.gz) = 397901
-SHA256 (opencv-opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d_GH0.tar.gz) = e9abccbabcace092e5424073168cc86d422585d15d25569f01fb6503b109e0e1
-SIZE (opencv-opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d_GH0.tar.gz) = 1470898
-SHA256 (opencv-opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12_GH0.tar.gz) = 0ae1f2d2a619ab177d96024e253e142d15dea27236510aaf1a65c7b529ee6677
-SIZE (opencv-opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12_GH0.tar.gz) = 63301261
-SHA256 (opencv-opencv_3rdparty-a56b6ac6f030c312b2dce17430eef13aed9af274_GH0.tar.gz) = 6d3552455d927dd28cdd6a78470398208ff2167b19b0dd51ab30a241d900cb4c
-SIZE (opencv-opencv_3rdparty-a56b6ac6f030c312b2dce17430eef13aed9af274_GH0.tar.gz) = 135706483
-SHA256 (496eed950f6d0e7fd92619d47e3cec8f06e96ace.patch) = 28edbd94c443b6aaa3054b4f9b35a4ad9a89dc45f40d408bcf3036950a072a32
-SIZE (496eed950f6d0e7fd92619d47e3cec8f06e96ace.patch) = 671
+TIMESTAMP = 1745669344
+SHA256 (opencv-opencv-4.11.0_GH0.tar.gz) = 9a7c11f924eff5f8d8070e297b322ee68b9227e003fd600d4b8122198091665f
+SIZE (opencv-opencv-4.11.0_GH0.tar.gz) = 95051012
+SHA256 (opencv-opencv_contrib-4.11.0_GH0.tar.gz) = 2dfc5957201de2aa785064711125af6abb2e80a64e2dc246aca4119b19687041
+SIZE (opencv-opencv_contrib-4.11.0_GH0.tar.gz) = 55450097
+SHA256 (opencv-ade-v0.1.2e_GH0.tar.gz) = 107711887d413127955d64a0e42974ec379c1ebb81832c79a21a9e3a2110e4bf
+SIZE (opencv-ade-v0.1.2e_GH0.tar.gz) = 117054
+SHA256 (opencv-opencv_3rdparty-7f55c0c26be418d494615afca15218566775c725_GH0.tar.gz) = 0b19085992da68a6b6b751ce7c37fd22b27e43ff28455a68280484e436c438e8
+SIZE (opencv-opencv_3rdparty-7f55c0c26be418d494615afca15218566775c725_GH0.tar.gz) = 102507737
diff --git a/graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake b/graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake
index 7643e2a237c4..42e3f9ca2bcb 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	2023-12-27 16:46:55 UTC
+--- modules/gapi/cmake/DownloadADE.cmake.orig	2025-04-26 12:11:25 UTC
 +++ modules/gapi/cmake/DownloadADE.cmake
-@@ -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")
+@@ -2,18 +2,12 @@ set(ade_md5 "962ce79e0b95591f226431f7b5f152cd")
+ set(ade_filename "v0.1.2e.zip")
+ set(ade_subdir "ade-0.1.2e")
+ set(ade_md5 "962ce79e0b95591f226431f7b5f152cd")
 -ocv_download(FILENAME ${ade_filename}
 -             HASH ${ade_md5}
 -             URL
@@ -19,7 +19,7 @@ framework.
 -             UNPACK RELATIVE_URL)
 -
 -if (NOT res)
-+set(file_id ade-0.1.2d/CMakeLists.txt)
++set(file_id ade-0.1.2e/CMakeLists.txt)
 +set(FILENAME ${ade_src_dir}/${file_id})
 +if(EXISTS ${FILENAME})
 +    message("++ ade: Using prefetched ${file_id}")
diff --git a/graphics/opencv/pkg-plist b/graphics/opencv/pkg-plist
index f775249861bf..d8c7d187a686 100644
--- a/graphics/opencv/pkg-plist
+++ b/graphics/opencv/pkg-plist
@@ -87,14 +87,10 @@ 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_math.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
@@ -105,6 +101,7 @@ include/opencv4/opencv2/core/hal/simd_utils.impl.hpp
 include/opencv4/opencv2/core/mat.hpp
 include/opencv4/opencv2/core/mat.inl.hpp
 include/opencv4/opencv2/core/matx.hpp
+include/opencv4/opencv2/core/matx.inl.hpp
 include/opencv4/opencv2/core/neon_utils.hpp
 include/opencv4/opencv2/core/ocl.hpp
 include/opencv4/opencv2/core/ocl_genbase.hpp
@@ -232,7 +229,6 @@ include/opencv4/opencv2/flann/flann.hpp
 include/opencv4/opencv2/flann/flann_base.hpp
 include/opencv4/opencv2/flann/general.h
 include/opencv4/opencv2/flann/ground_truth.h
-include/opencv4/opencv2/flann/hdf5.h
 include/opencv4/opencv2/flann/heap.h
 include/opencv4/opencv2/flann/hierarchical_clustering_index.h
 include/opencv4/opencv2/flann/index_testing.h
@@ -260,6 +256,103 @@ 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/ot.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/bindings_onnx.hpp
+include/opencv4/opencv2/gapi/infer/bindings_ov.hpp
+include/opencv4/opencv2/gapi/infer/ie.hpp
+include/opencv4/opencv2/gapi/infer/onnx.hpp
+include/opencv4/opencv2/gapi/infer/ov.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/ot.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/default.hpp
+include/opencv4/opencv2/gapi/streaming/onevpl/device_selector_interface.hpp
+include/opencv4/opencv2/gapi/streaming/onevpl/source.hpp
+include/opencv4/opencv2/gapi/streaming/queue_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
@@ -283,6 +376,7 @@ 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/detail/legacy.hpp
 include/opencv4/opencv2/imgproc/hal/hal.hpp
 include/opencv4/opencv2/imgproc/hal/interface.h
 include/opencv4/opencv2/imgproc/imgproc.hpp
@@ -374,6 +468,8 @@ include/opencv4/opencv2/shape/hist_cost.hpp
 include/opencv4/opencv2/shape/shape.hpp
 include/opencv4/opencv2/shape/shape_distance.hpp
 include/opencv4/opencv2/shape/shape_transformer.hpp
+include/opencv4/opencv2/signal.hpp
+include/opencv4/opencv2/signal/signal_resample.hpp
 include/opencv4/opencv2/stereo.hpp
 include/opencv4/opencv2/stereo/descriptor.hpp
 include/opencv4/opencv2/stereo/quasi_dense_stereo.hpp
@@ -418,6 +514,7 @@ include/opencv4/opencv2/tracking/tracking.hpp
 include/opencv4/opencv2/tracking/tracking_by_matching.hpp
 include/opencv4/opencv2/tracking/tracking_internals.hpp
 include/opencv4/opencv2/tracking/tracking_legacy.hpp
+include/opencv4/opencv2/tracking/twist.hpp
 include/opencv4/opencv2/video.hpp
 include/opencv4/opencv2/video/background_segm.hpp
 include/opencv4/opencv2/video/detail/tracking.detail.hpp
@@ -425,7 +522,6 @@ include/opencv4/opencv2/video/legacy/constants_c.h
 include/opencv4/opencv2/video/tracking.hpp
 include/opencv4/opencv2/video/video.hpp
 include/opencv4/opencv2/videoio.hpp
-include/opencv4/opencv2/videoio/cap_ios.h
 include/opencv4/opencv2/videoio/legacy/constants_c.h
 include/opencv4/opencv2/videoio/registry.hpp
 include/opencv4/opencv2/videoio/videoio.hpp
@@ -496,189 +592,290 @@ 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.409
+%%EIGEN%%lib/libopencv_alphamat.so.411
 lib/libopencv_aruco.so
 lib/libopencv_aruco.so.%%SHLIB_VER%%
-lib/libopencv_aruco.so.409
+lib/libopencv_aruco.so.411
 lib/libopencv_bgsegm.so
 lib/libopencv_bgsegm.so.%%SHLIB_VER%%
-lib/libopencv_bgsegm.so.409
+lib/libopencv_bgsegm.so.411
 lib/libopencv_bioinspired.so
 lib/libopencv_bioinspired.so.%%SHLIB_VER%%
-lib/libopencv_bioinspired.so.409
+lib/libopencv_bioinspired.so.411
 lib/libopencv_calib3d.so
 lib/libopencv_calib3d.so.%%SHLIB_VER%%
-lib/libopencv_calib3d.so.409
+lib/libopencv_calib3d.so.411
 lib/libopencv_ccalib.so
 lib/libopencv_ccalib.so.%%SHLIB_VER%%
-lib/libopencv_ccalib.so.409
+lib/libopencv_ccalib.so.411
 lib/libopencv_core.so
 lib/libopencv_core.so.%%SHLIB_VER%%
-lib/libopencv_core.so.409
+lib/libopencv_core.so.411
 lib/libopencv_datasets.so
 lib/libopencv_datasets.so.%%SHLIB_VER%%
-lib/libopencv_datasets.so.409
+lib/libopencv_datasets.so.411
 %%PROTOBUF%%lib/libopencv_dnn.so
 %%PROTOBUF%%lib/libopencv_dnn.so.%%SHLIB_VER%%
-%%PROTOBUF%%lib/libopencv_dnn.so.409
+%%PROTOBUF%%lib/libopencv_dnn.so.411
 %%PROTOBUF%%lib/libopencv_dnn_objdetect.so
 %%PROTOBUF%%lib/libopencv_dnn_objdetect.so.%%SHLIB_VER%%
-%%PROTOBUF%%lib/libopencv_dnn_objdetect.so.409
+%%PROTOBUF%%lib/libopencv_dnn_objdetect.so.411
 %%PROTOBUF%%lib/libopencv_dnn_superres.so
 %%PROTOBUF%%lib/libopencv_dnn_superres.so.%%SHLIB_VER%%
-%%PROTOBUF%%lib/libopencv_dnn_superres.so.409
+%%PROTOBUF%%lib/libopencv_dnn_superres.so.411
 lib/libopencv_dpm.so
 lib/libopencv_dpm.so.%%SHLIB_VER%%
-lib/libopencv_dpm.so.409
+lib/libopencv_dpm.so.411
 lib/libopencv_face.so
 lib/libopencv_face.so.%%SHLIB_VER%%
-lib/libopencv_face.so.409
+lib/libopencv_face.so.411
 lib/libopencv_features2d.so
 lib/libopencv_features2d.so.%%SHLIB_VER%%
-lib/libopencv_features2d.so.409
+lib/libopencv_features2d.so.411
 lib/libopencv_flann.so
 lib/libopencv_flann.so.%%SHLIB_VER%%
-lib/libopencv_flann.so.409
+lib/libopencv_flann.so.411
 lib/libopencv_freetype.so
 lib/libopencv_freetype.so.%%SHLIB_VER%%
-lib/libopencv_freetype.so.409
+lib/libopencv_freetype.so.411
 lib/libopencv_fuzzy.so
 lib/libopencv_fuzzy.so.%%SHLIB_VER%%
-lib/libopencv_fuzzy.so.409
+lib/libopencv_fuzzy.so.411
+lib/libopencv_gapi.so
+lib/libopencv_gapi.so.%%SHLIB_VER%%
+lib/libopencv_gapi.so.411
 lib/libopencv_hdf.so
 lib/libopencv_hdf.so.%%SHLIB_VER%%
-lib/libopencv_hdf.so.409
+lib/libopencv_hdf.so.411
 lib/libopencv_hfs.so
 lib/libopencv_hfs.so.%%SHLIB_VER%%
-lib/libopencv_hfs.so.409
+lib/libopencv_hfs.so.411
 lib/libopencv_highgui.so
 lib/libopencv_highgui.so.%%SHLIB_VER%%
-lib/libopencv_highgui.so.409
+lib/libopencv_highgui.so.411
 lib/libopencv_img_hash.so
 lib/libopencv_img_hash.so.%%SHLIB_VER%%
-lib/libopencv_img_hash.so.409
+lib/libopencv_img_hash.so.411
 lib/libopencv_imgcodecs.so
 lib/libopencv_imgcodecs.so.%%SHLIB_VER%%
-lib/libopencv_imgcodecs.so.409
+lib/libopencv_imgcodecs.so.411
 lib/libopencv_imgproc.so
 lib/libopencv_imgproc.so.%%SHLIB_VER%%
-lib/libopencv_imgproc.so.409
+lib/libopencv_imgproc.so.411
 lib/libopencv_intensity_transform.so
 lib/libopencv_intensity_transform.so.%%SHLIB_VER%%
-lib/libopencv_intensity_transform.so.409
+lib/libopencv_intensity_transform.so.411
 lib/libopencv_line_descriptor.so
 lib/libopencv_line_descriptor.so.%%SHLIB_VER%%
-lib/libopencv_line_descriptor.so.409
+lib/libopencv_line_descriptor.so.411
 %%PROTOBUF%%lib/libopencv_mcc.so
 %%PROTOBUF%%lib/libopencv_mcc.so.%%SHLIB_VER%%
-%%PROTOBUF%%lib/libopencv_mcc.so.409
+%%PROTOBUF%%lib/libopencv_mcc.so.411
 lib/libopencv_ml.so
 lib/libopencv_ml.so.%%SHLIB_VER%%
-lib/libopencv_ml.so.409
+lib/libopencv_ml.so.411
 lib/libopencv_objdetect.so
 lib/libopencv_objdetect.so.%%SHLIB_VER%%
-lib/libopencv_objdetect.so.409
+lib/libopencv_objdetect.so.411
 lib/libopencv_optflow.so
 lib/libopencv_optflow.so.%%SHLIB_VER%%
-lib/libopencv_optflow.so.409
+lib/libopencv_optflow.so.411
 %%OGRE3D%%lib/libopencv_ovis.so
 %%OGRE3D%%lib/libopencv_ovis.so.%%SHLIB_VER%%
-%%OGRE3D%%lib/libopencv_ovis.so.409
+%%OGRE3D%%lib/libopencv_ovis.so.411
 lib/libopencv_phase_unwrapping.so
 lib/libopencv_phase_unwrapping.so.%%SHLIB_VER%%
-lib/libopencv_phase_unwrapping.so.409
+lib/libopencv_phase_unwrapping.so.411
 lib/libopencv_photo.so
 lib/libopencv_photo.so.%%SHLIB_VER%%
-lib/libopencv_photo.so.409
+lib/libopencv_photo.so.411
 lib/libopencv_plot.so
 lib/libopencv_plot.so.%%SHLIB_VER%%
-lib/libopencv_plot.so.409
+lib/libopencv_plot.so.411
 lib/libopencv_quality.so
 lib/libopencv_quality.so.%%SHLIB_VER%%
-lib/libopencv_quality.so.409
+lib/libopencv_quality.so.411
 lib/libopencv_rapid.so
 lib/libopencv_rapid.so.%%SHLIB_VER%%
-lib/libopencv_rapid.so.409
+lib/libopencv_rapid.so.411
 lib/libopencv_reg.so
 lib/libopencv_reg.so.%%SHLIB_VER%%
-lib/libopencv_reg.so.409
+lib/libopencv_reg.so.411
 lib/libopencv_rgbd.so
 lib/libopencv_rgbd.so.%%SHLIB_VER%%
-lib/libopencv_rgbd.so.409
+lib/libopencv_rgbd.so.411
 lib/libopencv_saliency.so
 lib/libopencv_saliency.so.%%SHLIB_VER%%
-lib/libopencv_saliency.so.409
+lib/libopencv_saliency.so.411
 %%EIGEN%%lib/libopencv_sfm.so
 %%EIGEN%%lib/libopencv_sfm.so.%%SHLIB_VER%%
-%%EIGEN%%lib/libopencv_sfm.so.409
+%%EIGEN%%lib/libopencv_sfm.so.411
 lib/libopencv_shape.so
 lib/libopencv_shape.so.%%SHLIB_VER%%
-lib/libopencv_shape.so.409
+lib/libopencv_shape.so.411
+lib/libopencv_signal.so
+lib/libopencv_signal.so.%%SHLIB_VER%%
+lib/libopencv_signal.so.411
 lib/libopencv_stereo.so
 lib/libopencv_stereo.so.%%SHLIB_VER%%
-lib/libopencv_stereo.so.409
+lib/libopencv_stereo.so.411
 lib/libopencv_stitching.so
 lib/libopencv_stitching.so.%%SHLIB_VER%%
-lib/libopencv_stitching.so.409
+lib/libopencv_stitching.so.411
 lib/libopencv_structured_light.so
 lib/libopencv_structured_light.so.%%SHLIB_VER%%
-lib/libopencv_structured_light.so.409
+lib/libopencv_structured_light.so.411
 lib/libopencv_superres.so
 lib/libopencv_superres.so.%%SHLIB_VER%%
-lib/libopencv_superres.so.409
+lib/libopencv_superres.so.411
 lib/libopencv_surface_matching.so
 lib/libopencv_surface_matching.so.%%SHLIB_VER%%
-lib/libopencv_surface_matching.so.409
+lib/libopencv_surface_matching.so.411
 %%PROTOBUF%%lib/libopencv_text.so
 %%PROTOBUF%%lib/libopencv_text.so.%%SHLIB_VER%%
-%%PROTOBUF%%lib/libopencv_text.so.409
+%%PROTOBUF%%lib/libopencv_text.so.411
 lib/libopencv_tracking.so
 lib/libopencv_tracking.so.%%SHLIB_VER%%
-lib/libopencv_tracking.so.409
+lib/libopencv_tracking.so.411
 lib/libopencv_video.so
 lib/libopencv_video.so.%%SHLIB_VER%%
-lib/libopencv_video.so.409
+lib/libopencv_video.so.411
 lib/libopencv_videoio.so
 lib/libopencv_videoio.so.%%SHLIB_VER%%
-lib/libopencv_videoio.so.409
+lib/libopencv_videoio.so.411
 lib/libopencv_videostab.so
 lib/libopencv_videostab.so.%%SHLIB_VER%%
-lib/libopencv_videostab.so.409
+lib/libopencv_videostab.so.411
 %%VTK%%lib/libopencv_viz.so
 %%VTK%%lib/libopencv_viz.so.%%SHLIB_VER%%
-%%VTK%%lib/libopencv_viz.so.409
+%%VTK%%lib/libopencv_viz.so.411
 %%PROTOBUF%%lib/libopencv_wechat_qrcode.so
 %%PROTOBUF%%lib/libopencv_wechat_qrcode.so.%%SHLIB_VER%%
-%%PROTOBUF%%lib/libopencv_wechat_qrcode.so.409
+%%PROTOBUF%%lib/libopencv_wechat_qrcode.so.411
 lib/libopencv_xfeatures2d.so
 lib/libopencv_xfeatures2d.so.%%SHLIB_VER%%
-lib/libopencv_xfeatures2d.so.409
+lib/libopencv_xfeatures2d.so.411
 lib/libopencv_ximgproc.so
 lib/libopencv_ximgproc.so.%%SHLIB_VER%%
-lib/libopencv_ximgproc.so.409
+lib/libopencv_ximgproc.so.411
 lib/libopencv_xobjdetect.so
 lib/libopencv_xobjdetect.so.%%SHLIB_VER%%
-lib/libopencv_xobjdetect.so.409
+lib/libopencv_xobjdetect.so.411
 lib/libopencv_xphoto.so
 lib/libopencv_xphoto.so.%%SHLIB_VER%%
-lib/libopencv_xphoto.so.409
-%%EIGEN%%lib/opencv4/3rdparty/libcorrespondence.a
-%%EIGEN%%lib/opencv4/3rdparty/libmultiview.a
-%%EIGEN%%lib/opencv4/3rdparty/libnumeric.a
-%%EIGEN%%lib/opencv4/3rdparty/libsimple_pipeline.a
+lib/libopencv_xphoto.so.411
+%%EIGEN%%lib/opencv4/3rdparty/libopencv.sfm.correspondence.a
+%%EIGEN%%lib/opencv4/3rdparty/libopencv.sfm.multiview.a
+%%EIGEN%%lib/opencv4/3rdparty/libopencv.sfm.numeric.a
+%%EIGEN%%lib/opencv4/3rdparty/libopencv.sfm.simple_pipeline.a
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/Error/__init__.pyi
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/__init__.pyi
+%%EIGEN%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/alphamat/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/aruco/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/barcode/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/bgsegm/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/bioinspired/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/ccm/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/colored_kinfu/__init__.pyi
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/config-%%PYTHON_VER%%.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/config.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/cuda/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/datasets/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/detail/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/dnn/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/dnn_superres/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/dpm/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/dynafu/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/face/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/fisheye/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/flann/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/freetype/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/ft/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/core/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/core/cpu/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/core/fluid/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/core/ocl/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/ie/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/ie/detail/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/imgproc/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/imgproc/fluid/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/oak/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/onnx/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/onnx/ep/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/ot/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/ot/cpu/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/ov/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/own/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/own/detail/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/render/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/render/ocv/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/streaming/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/video/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/wip/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/wip/draw/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/wip/gst/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/wip/onevpl/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/hdf/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/hfs/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/img_hash/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/intensity_transform/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/ipp/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/kinfu/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/kinfu/detail/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/large_kinfu/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/legacy/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/line_descriptor/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/linemod/__init__.pyi
 %%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/mcc/__init__.pyi
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/misc/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/misc/version.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/ml/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/motempl/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/multicalib/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/ocl/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/ogl/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/omnidir/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/optflow/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/parallel/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/phase_unwrapping/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/plot/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/ppf_match_3d/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/py.typed
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/python-%%PYTHON_VER%%/cv2%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/quality/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/rapid/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/reg/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/rgbd/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/saliency/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/samples/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/segmentation/__init__.pyi
+%%EIGEN%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/sfm/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/signal/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/stereo/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/structured_light/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/text/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/typing/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/utils/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/utils/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/utils/fs/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/utils/nested/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/videoio_registry/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/videostab/__init__.pyi
+%%VTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/viz/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/wechat_qrcode/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/xfeatures2d/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/ximgproc/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/ximgproc/segmentation/__init__.pyi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/xphoto/__init__.pyi
 libdata/pkgconfig/opencv4.pc
-%%JAVA%%%%JAVASHAREDIR%%/opencv4/libopencv_java490.so
-%%JAVA%%%%JAVASHAREDIR%%/opencv4/opencv-490.jar
+%%JAVA%%%%JAVASHAREDIR%%/opencv4/libopencv_java4110.so
+%%JAVA%%%%JAVASHAREDIR%%/opencv4/opencv-4110.jar
 %%DATADIR%%/haarcascades/haarcascade_eye.xml
 %%DATADIR%%/haarcascades/haarcascade_eye_tree_eyeglasses.xml
 %%DATADIR%%/haarcascades/haarcascade_frontalcatface.xml
@@ -705,4 +902,3 @@ libdata/pkgconfig/opencv4.pc
 %%DATADIR%%/quality/brisque_range_live.yml
 %%DATADIR%%/valgrind.supp
 %%DATADIR%%/valgrind_3rdparty.supp
-%%PYTHON%%@dir %%PYTHON_SITELIBDIR%%/cv2/typing