CVS commit: pkgsrc/graphics/opencv

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/opencv
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Fri, 7 Feb 2025 21:54:17 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Feb  7 21:54:17 UTC 2025

Modified Files:
        pkgsrc/graphics/opencv: Makefile Makefile.common PLIST buildlink3.mk
            distinfo options.mk
        pkgsrc/graphics/opencv/patches: patch-modules_videoio_src_cap__v4l.cpp
Removed Files:
        pkgsrc/graphics/opencv: hacks.mk
        pkgsrc/graphics/opencv/patches:
            patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc
            patch-CMakeLists.txt
            patch-apps_visualisation_opencv__visualisation.cpp
            patch-cmake_OpenCVDetectCXXCompiler.cmake
            patch-cmake_OpenCVDetectPython.cmake
            patch-cmake_OpenCVFindLAPACK.cmake
            patch-cmake_OpenCVFindProtobuf.cmake
            patch-modules_core_include_opencv2_core_bindings__utils.hpp
            patch-modules_core_include_opencv2_core_opencl_opencl__info.hpp
            patch-modules_core_include_opencv2_core_types_c.h
            patch-modules_core_src_check.cpp patch-modules_core_src_rand.cpp
            patch-modules_core_src_system.cpp
            patch-modules_dnn_src_layers_accum__layer.cpp
            patch-modules_dnn_src_tensorflow_tf__importer.cpp
            patch-modules_dnn_src_torch_torch__importer.cpp
            patch-modules_dnn_test_test__precomp.hpp
            patch-modules_imgcodecs_src_grfmt__exr.cpp
            patch-modules_objdetect_src_qrcode__encoder.cpp
            patch-modules_objdetect_test_test__qrcode__encode.cpp
            patch-modules_ts_src_ts.cpp

Log Message:
opencv: update to 4.11.0.

This is the new major version under the Apache 2 license.
Too many changes to list, no concise summary found. Details at:
https://github.com/opencv/opencv/wiki/OpenCV-Change-Logs-v2.2%E2%80%90v4.10
https://github.com/opencv/opencv/wiki/OpenCV-Change-Logs#version4110


To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 pkgsrc/graphics/opencv/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/opencv/Makefile.common
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/opencv/PLIST
cvs rdiff -u -r1.31 -r1.32 pkgsrc/graphics/opencv/buildlink3.mk
cvs rdiff -u -r1.62 -r1.63 pkgsrc/graphics/opencv/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/graphics/opencv/hacks.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/opencv/options.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/opencv/patches/patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc \
    pkgsrc/graphics/opencv/patches/patch-apps_visualisation_opencv__visualisation.cpp \
    pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVFindProtobuf.cmake \
    pkgsrc/graphics/opencv/patches/patch-modules_core_include_opencv2_core_opencl_opencl__info.hpp \
    pkgsrc/graphics/opencv/patches/patch-modules_core_src_check.cpp \
    pkgsrc/graphics/opencv/patches/patch-modules_core_src_rand.cpp \
    pkgsrc/graphics/opencv/patches/patch-modules_core_src_system.cpp \
    pkgsrc/graphics/opencv/patches/patch-modules_dnn_src_layers_accum__layer.cpp \
    pkgsrc/graphics/opencv/patches/patch-modules_dnn_src_tensorflow_tf__importer.cpp \
    pkgsrc/graphics/opencv/patches/patch-modules_dnn_src_torch_torch__importer.cpp \
    pkgsrc/graphics/opencv/patches/patch-modules_dnn_test_test__precomp.hpp \
    pkgsrc/graphics/opencv/patches/patch-modules_imgcodecs_src_grfmt__exr.cpp \
    pkgsrc/graphics/opencv/patches/patch-modules_objdetect_src_qrcode__encoder.cpp \
    pkgsrc/graphics/opencv/patches/patch-modules_objdetect_test_test__qrcode__encode.cpp
cvs rdiff -u -r1.10 -r0 pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectCXXCompiler.cmake \
    pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectPython.cmake \
    pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVFindLAPACK.cmake \
    pkgsrc/graphics/opencv/patches/patch-modules_core_include_opencv2_core_bindings__utils.hpp \
    pkgsrc/graphics/opencv/patches/patch-modules_core_include_opencv2_core_types_c.h
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/graphics/opencv/patches/patch-modules_ts_src_ts.cpp
cvs rdiff -u -r1.9 -r1.10 \
    pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/opencv/Makefile
diff -u pkgsrc/graphics/opencv/Makefile:1.139 pkgsrc/graphics/opencv/Makefile:1.140
--- pkgsrc/graphics/opencv/Makefile:1.139       Fri Dec 27 08:20:01 2024
+++ pkgsrc/graphics/opencv/Makefile     Fri Feb  7 21:54:16 2025
@@ -1,9 +1,5 @@
-# $NetBSD: Makefile,v 1.139 2024/12/27 08:20:01 wiz Exp $
+# $NetBSD: Makefile,v 1.140 2025/02/07 21:54:16 wiz Exp $
 
-# Used by pyversion.mk
-BUILD_USES_CMAKE=      yes
-
-PKGREVISION= 12
 .include "Makefile.common"
 
 DISTNAME=      opencv-${OPENCV_VERSION}
@@ -11,19 +7,9 @@ DISTNAME=     opencv-${OPENCV_VERSION}
 MAINTAINER=    anthony.mallet%laas.fr@localhost
 COMMENT=       Library for computer vision problems
 
-INSTALLATION_DIRS+=    share/doc/opencv/papers
-INSTALLATION_DIRS+=    share/doc/opencv/ref/pics
-INSTALLATION_DIRS+=    share/OpenCV/haarcascades
-
-PKGCONFIG_OVERRIDE+=           ${CMAKE_BUILD_DIR}/unix-install/opencv.pc
-PKGCONFIG_OVERRIDE_STAGE=      post-build
-
 PY_PATCHPLIST=         yes
 REPLACE_PYTHON+=       samples/python/*.py
 
-# includes configure output and paths to gmake etc.
-CHECK_WRKREF_SKIP=     ${PREFIX}/lib/libopencv_core.*
-
 .include "options.mk"
 
 TEST_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib
@@ -32,15 +18,15 @@ TEST_ENV+=  DYLD_LIBRARY_PATH=${WRKSRC}/$
 TEST_TARGET=   test
 
 post-install:
-       ${RM} -r ${DESTDIR}${PREFIX}/share/licenses
-
-.include "../../mk/bsd.prefs.mk"
+       ${MV} ${DESTDIR}${PREFIX}/share/licenses/opencv4 ${DESTDIR}${PREFIX}/share/opencv4/licenses
 
-.include "../../devel/cmake/build.mk"
 .include "../../devel/protobuf/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/libavif/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
+BUILDLINK_API_DEPENDS.openjpeg+=       openjpeg>=2.3.1
+.include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../lang/python/extension.mk"

Index: pkgsrc/graphics/opencv/Makefile.common
diff -u pkgsrc/graphics/opencv/Makefile.common:1.21 pkgsrc/graphics/opencv/Makefile.common:1.22
--- pkgsrc/graphics/opencv/Makefile.common:1.21 Sun Aug 25 06:18:52 2024
+++ pkgsrc/graphics/opencv/Makefile.common      Fri Feb  7 21:54:16 2025
@@ -1,31 +1,25 @@
-# $NetBSD: Makefile.common,v 1.21 2024/08/25 06:18:52 wiz Exp $
-# used by graphics/opencv/Makefile
-# used by graphics/opencv-contrib-face/Makefile
+# $NetBSD: Makefile.common,v 1.22 2025/02/07 21:54:16 wiz Exp $
 #
-# DO NOT FORGET to regen graphics/opencv-contrib-face/distinfo!
+# used by wip/opencv/Makefile
+# used by wip/opencv-contrib-face/Makefile
+#
+# DO NOT FORGET to regen wip/opencv-contrib-face/distinfo!
 
-OPENCV_VERSION=        3.4.20
+OPENCV_VERSION=        4.11.0
 
 CATEGORIES=    graphics devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=opencv/}
 
 HOMEPAGE=      https://opencv.org/
-LICENSE=       modified-bsd
-
-PATCHDIR=      ${.CURDIR}/../../graphics/opencv/patches
+LICENSE=       apache-2.0
 
-USE_CXX_FEATURES=      c++14
-FORCE_CXX_STD=         c++14
 USE_LANGUAGES=         c c++
-USE_PKGLOCALEDIR=      yes
+USE_CXX_FEATURES=      c++17
 USE_TOOLS+=            gmake pkg-config
-CONFIGURE_DIRS+=       build
-CONFIGURE_ENV+=                MACHINE_ARCH=${MACHINE_ARCH}
 
 CHECK_PORTABILITY_SKIP+=       platforms/ios/cmake/Toolchains/xcodebuild_wrapper.in
 CHECK_PORTABILITY_SKIP+=       cmake/templates/xcode-*
 
-CMAKE_ARG_PATH=                ${WRKSRC}
 CMAKE_CONFIGURE_ARGS+=         -DBUILD_JAVA=OFF
 CMAKE_CONFIGURE_ARGS+=         -DBUILD_PROTOBUF=OFF
 CMAKE_CONFIGURE_ARGS+=         -DCV_ENABLE_INTRINSICS=OFF # XXX: problematic
@@ -34,24 +28,33 @@ CMAKE_CONFIGURE_ARGS+=              -DOPENCV_GENERAT
 CMAKE_CONFIGURE_ARGS+=         -DPROTOBUF_UPDATE_FILES=ON
 CMAKE_CONFIGURE_ARGS+=         -DWITH_EIGEN=OFF
 CMAKE_CONFIGURE_ARGS+=         -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
+# needed by protobuf
+CMAKE_CONFIGURE_ARGS+=         -DCMAKE_CXX_STANDARD=17
+# doesn't build on NetBSD with libva-2.22.0
+CMAKE_CONFIGURE_ARGS+=         -DWITH_VA=OFF
+#.include "../../multimedia/libva/buildlink3.mk"
+
+# lapack: disabled because it makes the build fail with
+# n file included from /scratch/wip/opencv/work/opencv-4.11.0/modules/core/src/hal_internal.cpp:50:
+# modules/core/src/hal_internal.cpp: In function 'int lapack_gemm_c(const fptype*, size_t, const fptype*, size_t, fptype, const fptype*, size_t, fptype, fptype*, size_t, int, int, int, int)':
+# modules/core/src/hal_internal.cpp:518:48: error: expected unqualified-id before '_Complex'
+#  518 |     int ldsrc1 = (int)(src1_step / sizeof(std::complex<fptype>));
+#      |                                                ^~~~~~~
+## Pulled in via numpy, too, but we need to handle it explicitly
+## for LAPACK C API and CMake tests here.
+#BLAS_C_INTERFACE=     yes
+#.include "../../mk/blas.buildlink3.mk"
+#CMAKE_CONFIGURE_ARGS+=        -DWITH_LAPACK=ON
+#CMAKE_CONFIGURE_ARGS+=        -DBLA_PREFER_PKGCONFIG=ON
+#CMAKE_CONFIGURE_ARGS+=        -DBLA_PKGCONFIG_BLAS=${BLAS_PC}
+#CMAKE_CONFIGURE_ARGS+=        -DBLA_PKGCONFIG_LAPACK=${LAPACK_PC}
+#CMAKE_CONFIGURE_ARGS+=        -DBLA_PKGCONFIG_CBLAS=${CBLAS_PC}
+#CMAKE_CONFIGURE_ARGS+=        -DBLA_PKGCONFIG_LAPACKE=${LAPACKE_PC}
+#CMAKE_CONFIGURE_ARGS+=        -DOPENCV_SKIP_LAPACK_EXTERN_C=ON
+
 CMAKE_CONFIGURE_ARGS.SunOS+=   -DENABLE_PRECOMPILED_HEADERS=OFF
 CMAKE_CONFIGURE_ARGS.SunOS+=   -DOPENCV_PYTHON_SKIP_LINKER_EXCLUDE_LIBS=ON
 
-# Pulled in via numpy, too, but we need to handle it explicitly
-# for LAPACK C API and CMake tests here.
-BLAS_C_INTERFACE=      yes
-.include "../../mk/blas.buildlink3.mk"
-CMAKE_CONFIGURE_ARGS+=         -DWITH_LAPACK=ON
-CMAKE_CONFIGURE_ARGS+=         -DBLA_PREFER_PKGCONFIG=ON
-CMAKE_CONFIGURE_ARGS+=         -DBLA_PKGCONFIG_BLAS=${BLAS_PC}
-CMAKE_CONFIGURE_ARGS+=         -DBLA_PKGCONFIG_LAPACK=${LAPACK_PC}
-CMAKE_CONFIGURE_ARGS+=         -DBLA_PKGCONFIG_CBLAS=${CBLAS_PC}
-CMAKE_CONFIGURE_ARGS+=         -DBLA_PKGCONFIG_LAPACKE=${LAPACKE_PC}
-CMAKE_CONFIGURE_ARGS+=         -DOPENCV_SKIP_LAPACK_EXTERN_C=ON
-
-BUILDLINK_TRANSFORM+=  rm:-Werror=address
-BUILDLINK_TRANSFORM+=  rm:-Werror=non-virtual-dtor
-
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--as-needed
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--gc-sections
 
@@ -62,7 +65,6 @@ BUILDLINK_TRANSFORM.SunOS+=   rm:-Wl,--gc-
 CMAKE_CONFIGURE_ARGS+=         -DCPU_BASELINE=""
 .endif
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27      # avoid Python 2.7
-
 .include "../../mk/atomic64.mk"
 .include "../../lang/python/pyversion.mk"
+.include "../../devel/cmake/build.mk"

Index: pkgsrc/graphics/opencv/PLIST
diff -u pkgsrc/graphics/opencv/PLIST:1.24 pkgsrc/graphics/opencv/PLIST:1.25
--- pkgsrc/graphics/opencv/PLIST:1.24   Tue Jan 16 19:23:05 2024
+++ pkgsrc/graphics/opencv/PLIST        Fri Feb  7 21:54:16 2025
@@ -1,353 +1,364 @@
-@comment $NetBSD: PLIST,v 1.24 2024/01/16 19:23:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.25 2025/02/07 21:54:16 wiz Exp $
 bin/opencv_annotation
-bin/opencv_createsamples
 bin/opencv_interactive-calibration
-bin/opencv_traincascade
+bin/opencv_model_diagnostics
 bin/opencv_version
 bin/opencv_visualisation
-include/opencv/cv.h
-include/opencv/cv.hpp
-include/opencv/cvaux.h
-include/opencv/cvaux.hpp
-include/opencv/cvwimage.h
-include/opencv/cxcore.h
-include/opencv/cxcore.hpp
-include/opencv/cxeigen.hpp
-include/opencv/cxmisc.h
-include/opencv/highgui.h
-include/opencv/ml.h
-include/opencv2/calib3d.hpp
-include/opencv2/calib3d/calib3d.hpp
-include/opencv2/calib3d/calib3d_c.h
-include/opencv2/core.hpp
-include/opencv2/core/affine.hpp
-include/opencv2/core/async.hpp
-include/opencv2/core/base.hpp
-include/opencv2/core/bindings_utils.hpp
-include/opencv2/core/bufferpool.hpp
-include/opencv2/core/check.hpp
-include/opencv2/core/core.hpp
-include/opencv2/core/core_c.h
-include/opencv2/core/cuda.hpp
-include/opencv2/core/cuda.inl.hpp
-include/opencv2/core/cuda/block.hpp
-include/opencv2/core/cuda/border_interpolate.hpp
-include/opencv2/core/cuda/color.hpp
-include/opencv2/core/cuda/common.hpp
-include/opencv2/core/cuda/datamov_utils.hpp
-include/opencv2/core/cuda/detail/color_detail.hpp
-include/opencv2/core/cuda/detail/reduce.hpp
-include/opencv2/core/cuda/detail/reduce_key_val.hpp
-include/opencv2/core/cuda/detail/transform_detail.hpp
-include/opencv2/core/cuda/detail/type_traits_detail.hpp
-include/opencv2/core/cuda/detail/vec_distance_detail.hpp
-include/opencv2/core/cuda/dynamic_smem.hpp
-include/opencv2/core/cuda/emulation.hpp
-include/opencv2/core/cuda/filters.hpp
-include/opencv2/core/cuda/funcattrib.hpp
-include/opencv2/core/cuda/functional.hpp
-include/opencv2/core/cuda/limits.hpp
-include/opencv2/core/cuda/reduce.hpp
-include/opencv2/core/cuda/saturate_cast.hpp
-include/opencv2/core/cuda/scan.hpp
-include/opencv2/core/cuda/simd_functions.hpp
-include/opencv2/core/cuda/transform.hpp
-include/opencv2/core/cuda/type_traits.hpp
-include/opencv2/core/cuda/utility.hpp
-include/opencv2/core/cuda/vec_distance.hpp
-include/opencv2/core/cuda/vec_math.hpp
-include/opencv2/core/cuda/vec_traits.hpp
-include/opencv2/core/cuda/warp.hpp
-include/opencv2/core/cuda/warp_reduce.hpp
-include/opencv2/core/cuda/warp_shuffle.hpp
-include/opencv2/core/cuda_stream_accessor.hpp
-include/opencv2/core/cuda_types.hpp
-include/opencv2/core/cv_cpu_dispatch.h
-include/opencv2/core/cv_cpu_helper.h
-include/opencv2/core/cvdef.h
-include/opencv2/core/cvstd.hpp
-include/opencv2/core/cvstd.inl.hpp
-include/opencv2/core/detail/async_promise.hpp
-include/opencv2/core/detail/exception_ptr.hpp
-include/opencv2/core/directx.hpp
-include/opencv2/core/eigen.hpp
-include/opencv2/core/fast_math.hpp
-include/opencv2/core/hal/hal.hpp
-include/opencv2/core/hal/interface.h
-include/opencv2/core/hal/intrin.hpp
-include/opencv2/core/hal/intrin_avx.hpp
-include/opencv2/core/hal/intrin_avx512.hpp
-include/opencv2/core/hal/intrin_cpp.hpp
-include/opencv2/core/hal/intrin_forward.hpp
-include/opencv2/core/hal/intrin_msa.hpp
-include/opencv2/core/hal/intrin_neon.hpp
-include/opencv2/core/hal/intrin_sse.hpp
-include/opencv2/core/hal/intrin_sse_em.hpp
-include/opencv2/core/hal/intrin_vsx.hpp
-include/opencv2/core/hal/intrin_wasm.hpp
-include/opencv2/core/hal/msa_macros.h
-include/opencv2/core/hal/simd_utils.impl.hpp
-include/opencv2/core/ippasync.hpp
-include/opencv2/core/mat.hpp
-include/opencv2/core/mat.inl.hpp
-include/opencv2/core/matx.hpp
-include/opencv2/core/neon_utils.hpp
-include/opencv2/core/ocl.hpp
-include/opencv2/core/ocl_genbase.hpp
-include/opencv2/core/opencl/ocl_defs.hpp
-include/opencv2/core/opencl/opencl_info.hpp
-include/opencv2/core/opencl/opencl_svm.hpp
-include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdblas.hpp
-include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdfft.hpp
-include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
-include/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp
-include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
-include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp
-include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp
-include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp
-include/opencv2/core/opencl/runtime/opencl_core.hpp
-include/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp
-include/opencv2/core/opencl/runtime/opencl_gl.hpp
-include/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp
-include/opencv2/core/opencl/runtime/opencl_svm_20.hpp
-include/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp
-include/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp
-include/opencv2/core/opengl.hpp
-include/opencv2/core/operations.hpp
-include/opencv2/core/optim.hpp
-include/opencv2/core/ovx.hpp
-include/opencv2/core/persistence.hpp
-include/opencv2/core/ptr.inl.hpp
-include/opencv2/core/saturate.hpp
-include/opencv2/core/simd_intrinsics.hpp
-include/opencv2/core/softfloat.hpp
-include/opencv2/core/sse_utils.hpp
-include/opencv2/core/traits.hpp
-include/opencv2/core/types.hpp
-include/opencv2/core/types_c.h
-include/opencv2/core/utility.hpp
-include/opencv2/core/utils/allocator_stats.hpp
-include/opencv2/core/utils/allocator_stats.impl.hpp
-include/opencv2/core/utils/filesystem.hpp
-include/opencv2/core/utils/fp_control_utils.hpp
-include/opencv2/core/utils/instrumentation.hpp
-include/opencv2/core/utils/logger.defines.hpp
-include/opencv2/core/utils/logger.hpp
-include/opencv2/core/utils/tls.hpp
-include/opencv2/core/utils/trace.hpp
-include/opencv2/core/va_intel.hpp
-include/opencv2/core/version.hpp
-include/opencv2/core/vsx_utils.hpp
-include/opencv2/core/wimage.hpp
-include/opencv2/cvconfig.h
-include/opencv2/dnn.hpp
-include/opencv2/dnn/all_layers.hpp
-include/opencv2/dnn/dict.hpp
-include/opencv2/dnn/dnn.hpp
-include/opencv2/dnn/dnn.inl.hpp
-include/opencv2/dnn/layer.details.hpp
-include/opencv2/dnn/layer.hpp
-include/opencv2/dnn/shape_utils.hpp
-include/opencv2/dnn/utils/inference_engine.hpp
-include/opencv2/features2d.hpp
-include/opencv2/features2d/features2d.hpp
-include/opencv2/features2d/hal/interface.h
-include/opencv2/flann.hpp
-include/opencv2/flann/all_indices.h
-include/opencv2/flann/allocator.h
-include/opencv2/flann/any.h
-include/opencv2/flann/autotuned_index.h
-include/opencv2/flann/composite_index.h
-include/opencv2/flann/config.h
-include/opencv2/flann/defines.h
-include/opencv2/flann/dist.h
-include/opencv2/flann/dummy.h
-include/opencv2/flann/dynamic_bitset.h
-include/opencv2/flann/flann.hpp
-include/opencv2/flann/flann_base.hpp
-include/opencv2/flann/general.h
-include/opencv2/flann/ground_truth.h
-include/opencv2/flann/hdf5.h
-include/opencv2/flann/heap.h
-include/opencv2/flann/hierarchical_clustering_index.h
-include/opencv2/flann/index_testing.h
-include/opencv2/flann/kdtree_index.h
-include/opencv2/flann/kdtree_single_index.h
-include/opencv2/flann/kmeans_index.h
-include/opencv2/flann/linear_index.h
-include/opencv2/flann/logger.h
-include/opencv2/flann/lsh_index.h
-include/opencv2/flann/lsh_table.h
-include/opencv2/flann/matrix.h
-include/opencv2/flann/miniflann.hpp
-include/opencv2/flann/nn_index.h
-include/opencv2/flann/object_factory.h
-include/opencv2/flann/params.h
-include/opencv2/flann/random.h
-include/opencv2/flann/result_set.h
-include/opencv2/flann/sampling.h
-include/opencv2/flann/saving.h
-include/opencv2/flann/simplex_downhill.h
-include/opencv2/flann/timer.h
-include/opencv2/highgui.hpp
-include/opencv2/highgui/highgui.hpp
-include/opencv2/highgui/highgui_c.h
-include/opencv2/imgcodecs.hpp
-include/opencv2/imgcodecs/imgcodecs.hpp
-include/opencv2/imgcodecs/imgcodecs_c.h
-include/opencv2/imgcodecs/ios.h
-include/opencv2/imgproc.hpp
-include/opencv2/imgproc/detail/distortion_model.hpp
-include/opencv2/imgproc/hal/hal.hpp
-include/opencv2/imgproc/hal/interface.h
-include/opencv2/imgproc/imgproc.hpp
-include/opencv2/imgproc/imgproc_c.h
-include/opencv2/imgproc/types_c.h
-include/opencv2/ml.hpp
-include/opencv2/ml/ml.hpp
-include/opencv2/ml/ml.inl.hpp
-include/opencv2/objdetect.hpp
-include/opencv2/objdetect/detection_based_tracker.hpp
-include/opencv2/objdetect/objdetect.hpp
-include/opencv2/objdetect/objdetect_c.h
-include/opencv2/opencv.hpp
-include/opencv2/opencv_modules.hpp
-include/opencv2/photo.hpp
-include/opencv2/photo/cuda.hpp
-include/opencv2/photo/photo.hpp
-include/opencv2/photo/photo_c.h
-include/opencv2/shape.hpp
-include/opencv2/shape/emdL1.hpp
-include/opencv2/shape/hist_cost.hpp
-include/opencv2/shape/shape.hpp
-include/opencv2/shape/shape_distance.hpp
-include/opencv2/shape/shape_transformer.hpp
-include/opencv2/stitching.hpp
-include/opencv2/stitching/detail/autocalib.hpp
-include/opencv2/stitching/detail/blenders.hpp
-include/opencv2/stitching/detail/camera.hpp
-include/opencv2/stitching/detail/exposure_compensate.hpp
-include/opencv2/stitching/detail/matchers.hpp
-include/opencv2/stitching/detail/motion_estimators.hpp
-include/opencv2/stitching/detail/seam_finders.hpp
-include/opencv2/stitching/detail/timelapsers.hpp
-include/opencv2/stitching/detail/util.hpp
-include/opencv2/stitching/detail/util_inl.hpp
-include/opencv2/stitching/detail/warpers.hpp
-include/opencv2/stitching/detail/warpers_inl.hpp
-include/opencv2/stitching/warpers.hpp
-include/opencv2/superres.hpp
-include/opencv2/superres/optical_flow.hpp
-include/opencv2/video.hpp
-include/opencv2/video/background_segm.hpp
-include/opencv2/video/tracking.hpp
-include/opencv2/video/tracking_c.h
-include/opencv2/video/video.hpp
-include/opencv2/videoio.hpp
-include/opencv2/videoio/cap_ios.h
-include/opencv2/videoio/registry.hpp
-include/opencv2/videoio/videoio.hpp
-include/opencv2/videoio/videoio_c.h
-include/opencv2/videostab.hpp
-include/opencv2/videostab/deblurring.hpp
-include/opencv2/videostab/fast_marching.hpp
-include/opencv2/videostab/fast_marching_inl.hpp
-include/opencv2/videostab/frame_source.hpp
-include/opencv2/videostab/global_motion.hpp
-include/opencv2/videostab/inpainting.hpp
-include/opencv2/videostab/log.hpp
-include/opencv2/videostab/motion_core.hpp
-include/opencv2/videostab/motion_stabilizing.hpp
-include/opencv2/videostab/optical_flow.hpp
-include/opencv2/videostab/outlier_rejection.hpp
-include/opencv2/videostab/ring_buffer.hpp
-include/opencv2/videostab/stabilizer.hpp
-include/opencv2/videostab/wobble_suppression.hpp
+include/opencv4/opencv2/calib3d.hpp
+include/opencv4/opencv2/calib3d/calib3d.hpp
+include/opencv4/opencv2/calib3d/calib3d_c.h
+include/opencv4/opencv2/core.hpp
+include/opencv4/opencv2/core/affine.hpp
+include/opencv4/opencv2/core/async.hpp
+include/opencv4/opencv2/core/base.hpp
+include/opencv4/opencv2/core/bindings_utils.hpp
+include/opencv4/opencv2/core/bufferpool.hpp
+include/opencv4/opencv2/core/check.hpp
+include/opencv4/opencv2/core/core.hpp
+include/opencv4/opencv2/core/core_c.h
+include/opencv4/opencv2/core/cuda.hpp
+include/opencv4/opencv2/core/cuda.inl.hpp
+include/opencv4/opencv2/core/cuda/block.hpp
+include/opencv4/opencv2/core/cuda/border_interpolate.hpp
+include/opencv4/opencv2/core/cuda/color.hpp
+include/opencv4/opencv2/core/cuda/common.hpp
+include/opencv4/opencv2/core/cuda/datamov_utils.hpp
+include/opencv4/opencv2/core/cuda/detail/color_detail.hpp
+include/opencv4/opencv2/core/cuda/detail/reduce.hpp
+include/opencv4/opencv2/core/cuda/detail/reduce_key_val.hpp
+include/opencv4/opencv2/core/cuda/detail/transform_detail.hpp
+include/opencv4/opencv2/core/cuda/detail/type_traits_detail.hpp
+include/opencv4/opencv2/core/cuda/detail/vec_distance_detail.hpp
+include/opencv4/opencv2/core/cuda/dynamic_smem.hpp
+include/opencv4/opencv2/core/cuda/emulation.hpp
+include/opencv4/opencv2/core/cuda/filters.hpp
+include/opencv4/opencv2/core/cuda/funcattrib.hpp
+include/opencv4/opencv2/core/cuda/functional.hpp
+include/opencv4/opencv2/core/cuda/limits.hpp
+include/opencv4/opencv2/core/cuda/reduce.hpp
+include/opencv4/opencv2/core/cuda/saturate_cast.hpp
+include/opencv4/opencv2/core/cuda/scan.hpp
+include/opencv4/opencv2/core/cuda/simd_functions.hpp
+include/opencv4/opencv2/core/cuda/transform.hpp
+include/opencv4/opencv2/core/cuda/type_traits.hpp
+include/opencv4/opencv2/core/cuda/utility.hpp
+include/opencv4/opencv2/core/cuda/vec_distance.hpp
+include/opencv4/opencv2/core/cuda/vec_math.hpp
+include/opencv4/opencv2/core/cuda/vec_traits.hpp
+include/opencv4/opencv2/core/cuda/warp.hpp
+include/opencv4/opencv2/core/cuda/warp_reduce.hpp
+include/opencv4/opencv2/core/cuda/warp_shuffle.hpp
+include/opencv4/opencv2/core/cuda_stream_accessor.hpp
+include/opencv4/opencv2/core/cuda_types.hpp
+include/opencv4/opencv2/core/cv_cpu_dispatch.h
+include/opencv4/opencv2/core/cv_cpu_helper.h
+include/opencv4/opencv2/core/cvdef.h
+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
+include/opencv4/opencv2/core/dualquaternion.inl.hpp
+include/opencv4/opencv2/core/eigen.hpp
+include/opencv4/opencv2/core/fast_math.hpp
+include/opencv4/opencv2/core/hal/hal.hpp
+include/opencv4/opencv2/core/hal/interface.h
+include/opencv4/opencv2/core/hal/intrin.hpp
+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_math.hpp
+include/opencv4/opencv2/core/hal/intrin_msa.hpp
+include/opencv4/opencv2/core/hal/intrin_neon.hpp
+include/opencv4/opencv2/core/hal/intrin_rvv071.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
+include/opencv4/opencv2/core/hal/intrin_wasm.hpp
+include/opencv4/opencv2/core/hal/msa_macros.h
+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
+include/opencv4/opencv2/core/opencl/ocl_defs.hpp
+include/opencv4/opencv2/core/opencl/opencl_info.hpp
+include/opencv4/opencv2/core/opencl/opencl_svm.hpp
+include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_clblas.hpp
+include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_clfft.hpp
+include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
+include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp
+include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
+include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp
+include/opencv4/opencv2/core/opencl/runtime/opencl_clblas.hpp
+include/opencv4/opencv2/core/opencl/runtime/opencl_clfft.hpp
+include/opencv4/opencv2/core/opencl/runtime/opencl_core.hpp
+include/opencv4/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp
+include/opencv4/opencv2/core/opencl/runtime/opencl_gl.hpp
+include/opencv4/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp
+include/opencv4/opencv2/core/opencl/runtime/opencl_svm_20.hpp
+include/opencv4/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp
+include/opencv4/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp
+include/opencv4/opencv2/core/opengl.hpp
+include/opencv4/opencv2/core/operations.hpp
+include/opencv4/opencv2/core/optim.hpp
+include/opencv4/opencv2/core/ovx.hpp
+include/opencv4/opencv2/core/parallel/backend/parallel_for.openmp.hpp
+include/opencv4/opencv2/core/parallel/backend/parallel_for.tbb.hpp
+include/opencv4/opencv2/core/parallel/parallel_backend.hpp
+include/opencv4/opencv2/core/persistence.hpp
+include/opencv4/opencv2/core/quaternion.hpp
+include/opencv4/opencv2/core/quaternion.inl.hpp
+include/opencv4/opencv2/core/saturate.hpp
+include/opencv4/opencv2/core/simd_intrinsics.hpp
+include/opencv4/opencv2/core/softfloat.hpp
+include/opencv4/opencv2/core/sse_utils.hpp
+include/opencv4/opencv2/core/traits.hpp
+include/opencv4/opencv2/core/types.hpp
+include/opencv4/opencv2/core/types_c.h
+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
+include/opencv4/opencv2/core/utils/logtag.hpp
+include/opencv4/opencv2/core/utils/tls.hpp
+include/opencv4/opencv2/core/utils/trace.hpp
+include/opencv4/opencv2/core/va_intel.hpp
+include/opencv4/opencv2/core/version.hpp
+include/opencv4/opencv2/core/vsx_utils.hpp
+include/opencv4/opencv2/cvconfig.h
+include/opencv4/opencv2/dnn.hpp
+include/opencv4/opencv2/dnn/all_layers.hpp
+include/opencv4/opencv2/dnn/dict.hpp
+include/opencv4/opencv2/dnn/dnn.hpp
+include/opencv4/opencv2/dnn/dnn.inl.hpp
+include/opencv4/opencv2/dnn/layer.details.hpp
+include/opencv4/opencv2/dnn/layer.hpp
+include/opencv4/opencv2/dnn/shape_utils.hpp
+include/opencv4/opencv2/dnn/utils/debug_utils.hpp
+include/opencv4/opencv2/dnn/utils/inference_engine.hpp
+include/opencv4/opencv2/dnn/version.hpp
+include/opencv4/opencv2/features2d.hpp
+include/opencv4/opencv2/features2d/features2d.hpp
+include/opencv4/opencv2/features2d/hal/interface.h
+include/opencv4/opencv2/flann.hpp
+include/opencv4/opencv2/flann/all_indices.h
+include/opencv4/opencv2/flann/allocator.h
+include/opencv4/opencv2/flann/any.h
+include/opencv4/opencv2/flann/autotuned_index.h
+include/opencv4/opencv2/flann/composite_index.h
+include/opencv4/opencv2/flann/config.h
+include/opencv4/opencv2/flann/defines.h
+include/opencv4/opencv2/flann/dist.h
+include/opencv4/opencv2/flann/dummy.h
+include/opencv4/opencv2/flann/dynamic_bitset.h
+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/heap.h
+include/opencv4/opencv2/flann/hierarchical_clustering_index.h
+include/opencv4/opencv2/flann/index_testing.h
+include/opencv4/opencv2/flann/kdtree_index.h
+include/opencv4/opencv2/flann/kdtree_single_index.h
+include/opencv4/opencv2/flann/kmeans_index.h
+include/opencv4/opencv2/flann/linear_index.h
+include/opencv4/opencv2/flann/logger.h
+include/opencv4/opencv2/flann/lsh_index.h
+include/opencv4/opencv2/flann/lsh_table.h
+include/opencv4/opencv2/flann/matrix.h
+include/opencv4/opencv2/flann/miniflann.hpp
+include/opencv4/opencv2/flann/nn_index.h
+include/opencv4/opencv2/flann/object_factory.h
+include/opencv4/opencv2/flann/params.h
+include/opencv4/opencv2/flann/random.h
+include/opencv4/opencv2/flann/result_set.h
+include/opencv4/opencv2/flann/sampling.h
+include/opencv4/opencv2/flann/saving.h
+include/opencv4/opencv2/flann/simplex_downhill.h
+include/opencv4/opencv2/flann/timer.h
+include/opencv4/opencv2/highgui.hpp
+include/opencv4/opencv2/highgui/highgui.hpp
+include/opencv4/opencv2/highgui/highgui_c.h
+include/opencv4/opencv2/imgcodecs.hpp
+include/opencv4/opencv2/imgcodecs/imgcodecs.hpp
+include/opencv4/opencv2/imgcodecs/imgcodecs_c.h
+include/opencv4/opencv2/imgcodecs/ios.h
+include/opencv4/opencv2/imgcodecs/legacy/constants_c.h
+include/opencv4/opencv2/imgcodecs/macosx.h
+include/opencv4/opencv2/imgproc.hpp
+include/opencv4/opencv2/imgproc/bindings.hpp
+include/opencv4/opencv2/imgproc/detail/gcgraph.hpp
+include/opencv4/opencv2/imgproc/detail/legacy.hpp
+include/opencv4/opencv2/imgproc/hal/hal.hpp
+include/opencv4/opencv2/imgproc/hal/interface.h
+include/opencv4/opencv2/imgproc/imgproc.hpp
+include/opencv4/opencv2/imgproc/imgproc_c.h
+include/opencv4/opencv2/imgproc/segmentation.hpp
+include/opencv4/opencv2/imgproc/types_c.h
+include/opencv4/opencv2/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
+include/opencv4/opencv2/photo.hpp
+include/opencv4/opencv2/photo/cuda.hpp
+include/opencv4/opencv2/photo/legacy/constants_c.h
+include/opencv4/opencv2/photo/photo.hpp
+include/opencv4/opencv2/stitching.hpp
+include/opencv4/opencv2/stitching/detail/autocalib.hpp
+include/opencv4/opencv2/stitching/detail/blenders.hpp
+include/opencv4/opencv2/stitching/detail/camera.hpp
+include/opencv4/opencv2/stitching/detail/exposure_compensate.hpp
+include/opencv4/opencv2/stitching/detail/matchers.hpp
+include/opencv4/opencv2/stitching/detail/motion_estimators.hpp
+include/opencv4/opencv2/stitching/detail/seam_finders.hpp
+include/opencv4/opencv2/stitching/detail/timelapsers.hpp
+include/opencv4/opencv2/stitching/detail/util.hpp
+include/opencv4/opencv2/stitching/detail/util_inl.hpp
+include/opencv4/opencv2/stitching/detail/warpers.hpp
+include/opencv4/opencv2/stitching/detail/warpers_inl.hpp
+include/opencv4/opencv2/stitching/warpers.hpp
+include/opencv4/opencv2/video.hpp
+include/opencv4/opencv2/video/background_segm.hpp
+include/opencv4/opencv2/video/detail/tracking.detail.hpp
+include/opencv4/opencv2/video/legacy/constants_c.h
+include/opencv4/opencv2/video/tracking.hpp
+include/opencv4/opencv2/video/video.hpp
+include/opencv4/opencv2/videoio.hpp
+include/opencv4/opencv2/videoio/legacy/constants_c.h
+include/opencv4/opencv2/videoio/registry.hpp
+include/opencv4/opencv2/videoio/videoio.hpp
+include/opencv4/opencv2/videoio/videoio_c.h
+lib/cmake/opencv4/OpenCVConfig-version.cmake
+lib/cmake/opencv4/OpenCVConfig.cmake
+lib/cmake/opencv4/OpenCVModules-release.cmake
+lib/cmake/opencv4/OpenCVModules.cmake
 lib/libopencv_calib3d.so
 lib/libopencv_calib3d.so.${PKGVERSION}
-lib/libopencv_calib3d.so.3.4
+lib/libopencv_calib3d.so.411
 lib/libopencv_core.so
 lib/libopencv_core.so.${PKGVERSION}
-lib/libopencv_core.so.3.4
+lib/libopencv_core.so.411
 lib/libopencv_dnn.so
 lib/libopencv_dnn.so.${PKGVERSION}
-lib/libopencv_dnn.so.3.4
+lib/libopencv_dnn.so.411
 lib/libopencv_features2d.so
 lib/libopencv_features2d.so.${PKGVERSION}
-lib/libopencv_features2d.so.3.4
+lib/libopencv_features2d.so.411
 lib/libopencv_flann.so
 lib/libopencv_flann.so.${PKGVERSION}
-lib/libopencv_flann.so.3.4
+lib/libopencv_flann.so.411
 lib/libopencv_highgui.so
 lib/libopencv_highgui.so.${PKGVERSION}
-lib/libopencv_highgui.so.3.4
+lib/libopencv_highgui.so.411
 lib/libopencv_imgcodecs.so
 lib/libopencv_imgcodecs.so.${PKGVERSION}
-lib/libopencv_imgcodecs.so.3.4
+lib/libopencv_imgcodecs.so.411
 lib/libopencv_imgproc.so
 lib/libopencv_imgproc.so.${PKGVERSION}
-lib/libopencv_imgproc.so.3.4
+lib/libopencv_imgproc.so.411
 lib/libopencv_ml.so
 lib/libopencv_ml.so.${PKGVERSION}
-lib/libopencv_ml.so.3.4
+lib/libopencv_ml.so.411
 lib/libopencv_objdetect.so
 lib/libopencv_objdetect.so.${PKGVERSION}
-lib/libopencv_objdetect.so.3.4
+lib/libopencv_objdetect.so.411
 lib/libopencv_photo.so
 lib/libopencv_photo.so.${PKGVERSION}
-lib/libopencv_photo.so.3.4
-lib/libopencv_shape.so
-lib/libopencv_shape.so.${PKGVERSION}
-lib/libopencv_shape.so.3.4
+lib/libopencv_photo.so.411
 lib/libopencv_stitching.so
 lib/libopencv_stitching.so.${PKGVERSION}
-lib/libopencv_stitching.so.3.4
-lib/libopencv_superres.so
-lib/libopencv_superres.so.${PKGVERSION}
-lib/libopencv_superres.so.3.4
+lib/libopencv_stitching.so.411
 lib/libopencv_video.so
 lib/libopencv_video.so.${PKGVERSION}
-lib/libopencv_video.so.3.4
+lib/libopencv_video.so.411
 lib/libopencv_videoio.so
 lib/libopencv_videoio.so.${PKGVERSION}
-lib/libopencv_videoio.so.3.4
-lib/libopencv_videostab.so
-lib/libopencv_videostab.so.${PKGVERSION}
-lib/libopencv_videostab.so.3.4
-lib/pkgconfig/opencv.pc
+lib/libopencv_videoio.so.411
+${PYSITELIB}/cv2/Error/__init__.pyi
 ${PYSITELIB}/cv2/__init__.py
-${PYSITELIB}/cv2/config-${PYVERSSUFFIX}.py
+${PYSITELIB}/cv2/__init__.pyi
+${PYSITELIB}/cv2/aruco/__init__.pyi
+${PYSITELIB}/cv2/barcode/__init__.pyi
+${PYSITELIB}/cv2/config-3.13.py
 ${PYSITELIB}/cv2/config.py
+${PYSITELIB}/cv2/cuda/__init__.pyi
+${PYSITELIB}/cv2/detail/__init__.pyi
+${PYSITELIB}/cv2/dnn/__init__.pyi
+${PYSITELIB}/cv2/fisheye/__init__.pyi
+${PYSITELIB}/cv2/flann/__init__.pyi
+${PYSITELIB}/cv2/ipp/__init__.pyi
 ${PYSITELIB}/cv2/load_config_py2.py
 ${PYSITELIB}/cv2/load_config_py3.py
-${PYSITELIB}/cv2/python-${PYVERSSUFFIX}/cv2.so
-share/OpenCV/OpenCVConfig-version.cmake
-share/OpenCV/OpenCVConfig.cmake
-share/OpenCV/OpenCVModules-release.cmake
-share/OpenCV/OpenCVModules.cmake
-share/OpenCV/haarcascades/haarcascade_eye.xml
-share/OpenCV/haarcascades/haarcascade_eye_tree_eyeglasses.xml
-share/OpenCV/haarcascades/haarcascade_frontalcatface.xml
-share/OpenCV/haarcascades/haarcascade_frontalcatface_extended.xml
-share/OpenCV/haarcascades/haarcascade_frontalface_alt.xml
-share/OpenCV/haarcascades/haarcascade_frontalface_alt2.xml
-share/OpenCV/haarcascades/haarcascade_frontalface_alt_tree.xml
-share/OpenCV/haarcascades/haarcascade_frontalface_default.xml
-share/OpenCV/haarcascades/haarcascade_fullbody.xml
-share/OpenCV/haarcascades/haarcascade_lefteye_2splits.xml
-share/OpenCV/haarcascades/haarcascade_licence_plate_rus_16stages.xml
-share/OpenCV/haarcascades/haarcascade_lowerbody.xml
-share/OpenCV/haarcascades/haarcascade_profileface.xml
-share/OpenCV/haarcascades/haarcascade_righteye_2splits.xml
-share/OpenCV/haarcascades/haarcascade_russian_plate_number.xml
-share/OpenCV/haarcascades/haarcascade_smile.xml
-share/OpenCV/haarcascades/haarcascade_upperbody.xml
-share/OpenCV/lbpcascades/lbpcascade_frontalcatface.xml
-share/OpenCV/lbpcascades/lbpcascade_frontalface.xml
-share/OpenCV/lbpcascades/lbpcascade_frontalface_improved.xml
-share/OpenCV/lbpcascades/lbpcascade_profileface.xml
-share/OpenCV/lbpcascades/lbpcascade_silverware.xml
-share/OpenCV/valgrind.supp
-share/OpenCV/valgrind_3rdparty.supp
-@pkgdir share/doc/opencv/papers
-@pkgdir share/doc/opencv/ref/pics
+${PYSITELIB}/cv2/mat_wrapper/__init__.py
+${PYSITELIB}/cv2/misc/__init__.py
+${PYSITELIB}/cv2/misc/version.py
+${PYSITELIB}/cv2/ml/__init__.pyi
+${PYSITELIB}/cv2/ocl/__init__.pyi
+${PYSITELIB}/cv2/ogl/__init__.pyi
+${PYSITELIB}/cv2/parallel/__init__.pyi
+${PYSITELIB}/cv2/py.typed
+${PYSITELIB}/cv2/python-3.13/cv2.so
+${PYSITELIB}/cv2/samples/__init__.pyi
+${PYSITELIB}/cv2/segmentation/__init__.pyi
+${PYSITELIB}/cv2/typing/__init__.py
+${PYSITELIB}/cv2/utils/__init__.py
+${PYSITELIB}/cv2/utils/__init__.pyi
+${PYSITELIB}/cv2/utils/fs/__init__.pyi
+${PYSITELIB}/cv2/utils/nested/__init__.pyi
+${PYSITELIB}/cv2/videoio_registry/__init__.pyi
+share/opencv4/haarcascades/haarcascade_eye.xml
+share/opencv4/haarcascades/haarcascade_eye_tree_eyeglasses.xml
+share/opencv4/haarcascades/haarcascade_frontalcatface.xml
+share/opencv4/haarcascades/haarcascade_frontalcatface_extended.xml
+share/opencv4/haarcascades/haarcascade_frontalface_alt.xml
+share/opencv4/haarcascades/haarcascade_frontalface_alt2.xml
+share/opencv4/haarcascades/haarcascade_frontalface_alt_tree.xml
+share/opencv4/haarcascades/haarcascade_frontalface_default.xml
+share/opencv4/haarcascades/haarcascade_fullbody.xml
+share/opencv4/haarcascades/haarcascade_lefteye_2splits.xml
+share/opencv4/haarcascades/haarcascade_license_plate_rus_16stages.xml
+share/opencv4/haarcascades/haarcascade_lowerbody.xml
+share/opencv4/haarcascades/haarcascade_profileface.xml
+share/opencv4/haarcascades/haarcascade_righteye_2splits.xml
+share/opencv4/haarcascades/haarcascade_russian_plate_number.xml
+share/opencv4/haarcascades/haarcascade_smile.xml
+share/opencv4/haarcascades/haarcascade_upperbody.xml
+share/opencv4/lbpcascades/lbpcascade_frontalcatface.xml
+share/opencv4/lbpcascades/lbpcascade_frontalface.xml
+share/opencv4/lbpcascades/lbpcascade_frontalface_improved.xml
+share/opencv4/lbpcascades/lbpcascade_profileface.xml
+share/opencv4/lbpcascades/lbpcascade_silverware.xml
+share/opencv4/licenses/SoftFloat-COPYING.txt
+share/opencv4/licenses/flatbuffers-LICENSE.txt
+share/opencv4/licenses/ittnotify-LICENSE.BSD
+share/opencv4/licenses/ittnotify-LICENSE.GPL
+share/opencv4/licenses/mscr-chi_table_LICENSE.txt
+share/opencv4/licenses/opencl-headers-LICENSE.txt
+share/opencv4/valgrind.supp
+share/opencv4/valgrind_3rdparty.supp

Index: pkgsrc/graphics/opencv/buildlink3.mk
diff -u pkgsrc/graphics/opencv/buildlink3.mk:1.31 pkgsrc/graphics/opencv/buildlink3.mk:1.32
--- pkgsrc/graphics/opencv/buildlink3.mk:1.31   Thu Dec 26 23:57:21 2024
+++ pkgsrc/graphics/opencv/buildlink3.mk        Fri Feb  7 21:54:16 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.31 2024/12/26 23:57:21 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2025/02/07 21:54:16 wiz Exp $
 
 BUILDLINK_TREE+=       opencv
 
@@ -6,17 +6,21 @@ BUILDLINK_TREE+=      opencv
 OPENCV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.opencv+= opencv>=3.0.0
-BUILDLINK_ABI_DEPENDS.opencv+= opencv>=3.4.20nb11
+BUILDLINK_ABI_DEPENDS.opencv+= opencv>=4
 BUILDLINK_PKGSRCDIR.opencv?=   ../../graphics/opencv
 
+BUILDLINK_INCDIRS.opencv+=     include/opencv4
+
 pkgbase := opencv
 .include "../../mk/pkg-build-options.mk"
 
 .include "../../devel/protobuf/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/openjpeg/buildlink3.mk"
 .if ${PKG_BUILD_OPTIONS.opencv:Mjasper}
 .  include "../../graphics/jasper/buildlink3.mk"
 .endif
+.include "../../graphics/libavif/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"

Index: pkgsrc/graphics/opencv/distinfo
diff -u pkgsrc/graphics/opencv/distinfo:1.62 pkgsrc/graphics/opencv/distinfo:1.63
--- pkgsrc/graphics/opencv/distinfo:1.62        Mon Mar 11 09:37:20 2024
+++ pkgsrc/graphics/opencv/distinfo     Fri Feb  7 21:54:16 2025
@@ -1,31 +1,10 @@
-$NetBSD: distinfo,v 1.62 2024/03/11 09:37:20 jperkin Exp $
+$NetBSD: distinfo,v 1.63 2025/02/07 21:54:16 wiz Exp $
 
-BLAKE2s (opencv-3.4.20.tar.gz) = 2b69e87e4accd4da4d1a599e05fc206cd5644ddeb7f61c9800ddb625648e4ffe
-SHA512 (opencv-3.4.20.tar.gz) = 45b4447a5312acefffb9b11a6d4e8d8e98c62dcec902e4589d91bb32e7b5bc6e5c6407881a9edcca7d97df598e3f70925e458b2772d991d64ed2cc82701441f8
-Size (opencv-3.4.20.tar.gz) = 88348843 bytes
+BLAKE2s (opencv-4.11.0.tar.gz) = 9d98eab1bed16a059e66f52c4ee90bc7dd20603a1bbef0e89a4f9da568f08fca
+SHA512 (opencv-4.11.0.tar.gz) = 3b6e0da8169449944715de9e66380977791069a1d8288534ec768eaa2fb68533821fd8e06eac925a26656baf42185258b13aa80579e1e9be3ebc18fcea66f24d
+Size (opencv-4.11.0.tar.gz) = 95051012 bytes
 SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
-SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf
-SHA1 (patch-CMakeLists.txt) = 86a524683091aad65dfaf719d56c5f76056596b6
-SHA1 (patch-apps_visualisation_opencv__visualisation.cpp) = b62c32172049c6369fd62a5c72325eef995fd1d0
-SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = ac7deccedcc5071d3785c7827a06419713ba0529
-SHA1 (patch-cmake_OpenCVDetectPython.cmake) = 87a304f12f4069103670052dfbedadff2c6e9c05
-SHA1 (patch-cmake_OpenCVFindLAPACK.cmake) = c7e8db9351f103c7e2a248f047e448e7bf0ac5ad
-SHA1 (patch-cmake_OpenCVFindProtobuf.cmake) = 2c8cde9efeb3f8a633c5712682ea16adec2e5c38
-SHA1 (patch-modules_core_include_opencv2_core_bindings__utils.hpp) = 44a8602670141b2a3bc90c5e1c23a8e7f96a1d40
-SHA1 (patch-modules_core_include_opencv2_core_opencl_opencl__info.hpp) = f0cff24b2a760086f54ab66536bdfee4f4f1a6d7
-SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
-SHA1 (patch-modules_core_src_check.cpp) = c8dac4e0fb6fa4a0dca6a2794bd598ba114e78b6
 SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
-SHA1 (patch-modules_core_src_rand.cpp) = aa87ee5a538deb1a2ed3e89dd3dd4ee9b86ae0de
-SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
-SHA1 (patch-modules_dnn_src_layers_accum__layer.cpp) = 20a12489f7e7fcbc90d47871f12ac500ab8ae6ed
-SHA1 (patch-modules_dnn_src_tensorflow_tf__importer.cpp) = 9b3628d91c2217c4b1ed77413efd4c0bf85758c4
-SHA1 (patch-modules_dnn_src_torch_torch__importer.cpp) = 814a3cc929569b691d01e34252dbd185f31161c2
-SHA1 (patch-modules_dnn_test_test__precomp.hpp) = 9bf15d32394f36b92e5fc5d57fd576b3860233ae
 SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
-SHA1 (patch-modules_imgcodecs_src_grfmt__exr.cpp) = 1a33d1b14e837b973b3ac2465d0b20fd6501e9bf
 SHA1 (patch-modules_imgproc_src_resize.cpp) = e842d5960c4c00162a34f46cb45cf69d0e9f21ce
-SHA1 (patch-modules_objdetect_src_qrcode__encoder.cpp) = eeeb7ec8ff7def1a5c6f9e81045f6bf36226de39
-SHA1 (patch-modules_objdetect_test_test__qrcode__encode.cpp) = aa76e97a5e7e3688c7a9c424d8b7b10c5a6fcb11
-SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
-SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = f80cc2f5b37e04378a2f25b2fa14e9b3206513c3
+SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = f9ff94f46cdee1b9616ceb2982b4f5925c0bfb3f

Index: pkgsrc/graphics/opencv/options.mk
diff -u pkgsrc/graphics/opencv/options.mk:1.14 pkgsrc/graphics/opencv/options.mk:1.15
--- pkgsrc/graphics/opencv/options.mk:1.14      Sun Aug 25 06:18:52 2024
+++ pkgsrc/graphics/opencv/options.mk   Fri Feb  7 21:54:16 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2024/08/25 06:18:52 wiz Exp $
+# $NetBSD: options.mk,v 1.15 2025/02/07 21:54:16 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.opencv
 PKG_SUPPORTED_OPTIONS= ffmpeg jasper

Index: pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp
diff -u pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp:1.9 pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp:1.10
--- pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp:1.9   Sat Oct 16 07:16:29 2021
+++ pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp       Fri Feb  7 21:54:17 2025
@@ -1,9 +1,9 @@
-$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.9 2021/10/16 07:16:29 adam Exp $
+$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.10 2025/02/07 21:54:17 wiz Exp $
 
 Conditionalize settings not available in NetBSD's v4l2 emulation.
 Avoid non-standard integer types.
 
---- modules/videoio/src/cap_v4l.cpp.orig       2021-10-08 18:31:56.000000000 +0000
+--- modules/videoio/src/cap_v4l.cpp.orig       2025-01-08 12:47:46.000000000 +0000
 +++ modules/videoio/src/cap_v4l.cpp
 @@ -215,6 +215,14 @@ make & enjoy!
  #include <fcntl.h>
@@ -20,7 +20,7 @@ Avoid non-standard integer types.
  #include <sys/types.h>
  #include <sys/mman.h>
  
-@@ -236,24 +244,30 @@ make & enjoy!
+@@ -241,24 +249,30 @@ typedef uint32_t __u32;
  #endif
  
  // https://github.com/opencv/opencv/issues/13335
@@ -49,81 +49,25 @@ Avoid non-standard integer types.
  #endif
 +#endif
  
- #ifndef V4L2_PIX_FMT_Y10
- #define V4L2_PIX_FMT_Y10 v4l2_fourcc('Y', '1', '0', ' ')
-@@ -555,13 +569,17 @@ bool CvCaptureCAM_V4L::autosetup_capture
-             V4L2_PIX_FMT_NV12,
-             V4L2_PIX_FMT_NV21,
-             V4L2_PIX_FMT_SBGGR8,
-+#ifdef V4L2_PIX_FMT_SGBRG8
-             V4L2_PIX_FMT_SGBRG8,
-+#endif
-             V4L2_PIX_FMT_SN9C10X,
- #ifdef HAVE_JPEG
-             V4L2_PIX_FMT_MJPEG,
-             V4L2_PIX_FMT_JPEG,
- #endif
-+#ifdef V4L2_PIX_FMT_Y16
-             V4L2_PIX_FMT_Y16,
-+#endif
-             V4L2_PIX_FMT_Y12,
-             V4L2_PIX_FMT_Y10,
-             V4L2_PIX_FMT_GREY,
-@@ -618,9 +636,13 @@ bool CvCaptureCAM_V4L::convertableToRgb(
-     case V4L2_PIX_FMT_UYVY:
-     case V4L2_PIX_FMT_SBGGR8:
-     case V4L2_PIX_FMT_SN9C10X:
-+#ifdef V4L2_PIX_FMT_SGBRG8
-     case V4L2_PIX_FMT_SGBRG8:
-+#endif
-     case V4L2_PIX_FMT_RGB24:
-+#ifdef V4L2_PIX_FMT_Y16
-     case V4L2_PIX_FMT_Y16:
-+#endif
-     case V4L2_PIX_FMT_Y10:
-     case V4L2_PIX_FMT_GREY:
-     case V4L2_PIX_FMT_BGR24:
-@@ -655,7 +677,9 @@ void CvCaptureCAM_V4L::v4l2_create_frame
-             channels = 1;
-             size.height = size.height * 3 / 2; // "1.5" channels
-             break;
-+#ifdef V4L2_PIX_FMT_Y16
-         case V4L2_PIX_FMT_Y16:
-+#endif
-         case V4L2_PIX_FMT_Y12:
-         case V4L2_PIX_FMT_Y10:
-             depth = IPL_DEPTH_16U;
-@@ -1532,11 +1556,13 @@ void CvCaptureCAM_V4L::convertToRgb(cons
-                 (unsigned char*)buffers[MAX_V4L_BUFFERS].start,
-                 (unsigned char*)frame.imageData);
-         return;
-+#ifdef V4L2_PIX_FMT_SGBRG8
-     case V4L2_PIX_FMT_SGBRG8:
-         sgbrg2rgb24(imageSize.width, imageSize.height,
-                 (unsigned char*)currentBuffer.start,
-                 (unsigned char*)frame.imageData);
-         return;
-+#endif
-     default:
-         break;
-     }
-@@ -1575,6 +1601,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
+ #ifndef v4l2_fourcc_be
+ #define v4l2_fourcc_be(a, b, c, d) (v4l2_fourcc(a, b, c, d) | (1U << 31))
+@@ -1471,6 +1485,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
      case V4L2_PIX_FMT_RGB24:
-         cv::cvtColor(cv::Mat(imageSize, CV_8UC3, currentBuffer.start), destination, COLOR_RGB2BGR);
+         cv::cvtColor(cv::Mat(imageSize, CV_8UC3, start), frame, COLOR_RGB2BGR);
          return;
 +#ifdef V4L2_PIX_FMT_Y16
      case V4L2_PIX_FMT_Y16:
      {
-         cv::Mat temp(imageSize, CV_8UC1, buffers[MAX_V4L_BUFFERS].start);
-@@ -1596,6 +1623,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
-         cv::cvtColor(temp, destination, COLOR_GRAY2BGR);
+         // https://www.kernel.org/doc/html/v4.10/media/uapi/v4l/pixfmt-y16.html
+@@ -1535,6 +1550,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
+         cv::cvtColor(cv::Mat(imageSize, CV_8UC1, start), frame, COLOR_BayerGB2BGR);
          return;
      }
 +#endif
      case V4L2_PIX_FMT_GREY:
-         cv::cvtColor(cv::Mat(imageSize, CV_8UC1, currentBuffer.start), destination, COLOR_GRAY2BGR);
+         cv::cvtColor(cv::Mat(imageSize, CV_8UC1, start), frame, COLOR_GRAY2BGR);
          break;
-@@ -1708,8 +1736,10 @@ static inline int capPropertyToV4L2(int 
+@@ -1654,8 +1670,10 @@ static inline int capPropertyToV4L2(int 
          return -1;
      case cv::CAP_PROP_FOURCC:
          return -1;
@@ -134,7 +78,7 @@ Avoid non-standard integer types.
      case cv::CAP_PROP_FORMAT:
          return -1;
      case cv::CAP_PROP_MODE:
-@@ -1724,8 +1754,10 @@ static inline int capPropertyToV4L2(int 
+@@ -1670,8 +1688,10 @@ static inline int capPropertyToV4L2(int 
          return V4L2_CID_HUE;
      case cv::CAP_PROP_GAIN:
          return V4L2_CID_GAIN;
@@ -145,7 +89,7 @@ Avoid non-standard integer types.
      case cv::CAP_PROP_CONVERT_RGB:
          return -1;
      case cv::CAP_PROP_WHITE_BALANCE_BLUE_U:
-@@ -1736,8 +1768,10 @@ static inline int capPropertyToV4L2(int 
+@@ -1682,8 +1702,10 @@ static inline int capPropertyToV4L2(int 
          return -1;
      case cv::CAP_PROP_SHARPNESS:
          return V4L2_CID_SHARPNESS;
@@ -156,7 +100,7 @@ Avoid non-standard integer types.
      case cv::CAP_PROP_GAMMA:
          return V4L2_CID_GAMMA;
      case cv::CAP_PROP_TEMPERATURE:
-@@ -1748,34 +1782,54 @@ static inline int capPropertyToV4L2(int 
+@@ -1694,34 +1716,54 @@ static inline int capPropertyToV4L2(int 
          return -1;
      case cv::CAP_PROP_WHITE_BALANCE_RED_V:
          return V4L2_CID_RED_BALANCE;

Prev by Date: CVS commit: pkgsrc/net/py-aiohappyeyeballs
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/net/py-aiohappyeyeballs
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index