pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
opencv: fix build using upstream patches
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Mon Jul 6 19:13:18 2026 +0200
Changeset: 941a686c0537f58586747e81578b997c197c2960
Modified Files:
opencv/Makefile
opencv/PLIST
opencv/buildlink3.mk
opencv/distinfo
Added Files:
opencv/patches/patch-modules_core_src_hal__internal.cpp
opencv/patches/patch-modules_dnn_CMakeLists.txt
opencv/patches/patch-modules_dnn_src_glog__emulator.hpp
opencv/patches/patch-modules_dnn_src_layers_cast2__layer.cpp
opencv/patches/patch-modules_dnn_src_ocl4dnn_include_common.hpp
opencv/patches/patch-modules_dnn_src_onnx_onnx__importer.cpp
opencv/patches/patch-modules_dnn_src_protobuf__io.cpp
opencv/patches/patch-modules_dnn_src_protobuf__io.hpp
opencv/patches/patch-modules_dnn_src_tensorflow_tf__importer.cpp
opencv/patches/patch-modules_dnn_src_tensorflow_tf__io.cpp
Removed Files:
opencv/TODO
opencv/unapplied-patch
Log Message:
opencv: fix build using upstream patches
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=941a686c0537f58586747e81578b997c197c2960
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
opencv/Makefile | 10 +-
opencv/PLIST | 615 ++++++++++-----------
opencv/TODO | 133 -----
opencv/buildlink3.mk | 2 +-
opencv/distinfo | 10 +
.../patch-modules_core_src_hal__internal.cpp | 15 +
opencv/patches/patch-modules_dnn_CMakeLists.txt | 37 ++
.../patch-modules_dnn_src_glog__emulator.hpp | 17 +
.../patch-modules_dnn_src_layers_cast2__layer.cpp | 66 +++
...atch-modules_dnn_src_ocl4dnn_include_common.hpp | 15 +
.../patch-modules_dnn_src_onnx_onnx__importer.cpp | 25 +
.../patches/patch-modules_dnn_src_protobuf__io.cpp | 178 ++++++
.../patches/patch-modules_dnn_src_protobuf__io.hpp | 49 ++
...tch-modules_dnn_src_tensorflow_tf__importer.cpp | 25 +
.../patch-modules_dnn_src_tensorflow_tf__io.cpp | 17 +
opencv/unapplied-patch | 55 --
16 files changed, 767 insertions(+), 502 deletions(-)
diffs:
diff --git a/opencv/Makefile b/opencv/Makefile
index 2811c8fd4c..24d5c5ecc8 100644
--- a/opencv/Makefile
+++ b/opencv/Makefile
@@ -28,8 +28,16 @@ TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib
TEST_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib
TEST_TARGET= test
+# https://github.com/fkenmar/opencv/commit/142801f769ed4946a161f62738bac5a5fe56a60f
+post-extract:
+ ${RM} -f ${WRKSRC}/modules/dnn/misc/caffe/opencv-caffe.pb.cc
+ ${RM} -f ${WRKSRC}/modules/dnn/misc/caffe/opencv-caffe.pb.h
+ ${RM} -f ${WRKSRC}/modules/dnn/src/caffe/caffe_io.cpp
+ cd ${WRKSRC} && ${MV} modules/dnn/src/caffe/glog_emulator.hpp modules/dnn/src/glog_emulator.hpp
+ cd ${WRKSRC} && ${MV} modules/dnn/src/caffe/caffe_io.hpp modules/dnn/src/protobuf_io.hpp
+
post-install:
- ${MV} ${DESTDIR}${PREFIX}/share/licenses/opencv4 ${DESTDIR}${PREFIX}/share/opencv4/licenses
+ ${MV} ${DESTDIR}${PREFIX}/share/licenses/opencv5 ${DESTDIR}${PREFIX}/share/opencv5/licenses
.include "../../devel/protobuf/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/opencv/PLIST b/opencv/PLIST
index 6794f94136..460b7a7595 100644
--- a/opencv/PLIST
+++ b/opencv/PLIST
@@ -1,312 +1,322 @@
-@comment $NetBSD: PLIST,v 1.29 2026/01/05 02:53:35 wiz Exp $
-bin/opencv_annotation
-bin/opencv_interactive-calibration
+@comment $NetBSD$
bin/opencv_model_diagnostics
bin/opencv_version
-bin/opencv_visualisation
-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/cuda_compat.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_legacy_ops.h
-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.413
+include/opencv5/opencv2/calib.hpp
+include/opencv5/opencv2/calib3d.hpp
+include/opencv5/opencv2/core.hpp
+include/opencv5/opencv2/core/affine.hpp
+include/opencv5/opencv2/core/async.hpp
+include/opencv5/opencv2/core/base.hpp
+include/opencv5/opencv2/core/bindings_utils.hpp
+include/opencv5/opencv2/core/bufferpool.hpp
+include/opencv5/opencv2/core/check.hpp
+include/opencv5/opencv2/core/core.hpp
+include/opencv5/opencv2/core/cuda.hpp
+include/opencv5/opencv2/core/cuda.inl.hpp
+include/opencv5/opencv2/core/cuda/block.hpp
+include/opencv5/opencv2/core/cuda/border_interpolate.hpp
+include/opencv5/opencv2/core/cuda/color.hpp
+include/opencv5/opencv2/core/cuda/common.hpp
+include/opencv5/opencv2/core/cuda/cuda_compat.hpp
+include/opencv5/opencv2/core/cuda/datamov_utils.hpp
+include/opencv5/opencv2/core/cuda/detail/color_detail.hpp
+include/opencv5/opencv2/core/cuda/detail/reduce.hpp
+include/opencv5/opencv2/core/cuda/detail/reduce_key_val.hpp
+include/opencv5/opencv2/core/cuda/detail/transform_detail.hpp
+include/opencv5/opencv2/core/cuda/detail/type_traits_detail.hpp
+include/opencv5/opencv2/core/cuda/detail/vec_distance_detail.hpp
+include/opencv5/opencv2/core/cuda/dynamic_smem.hpp
+include/opencv5/opencv2/core/cuda/emulation.hpp
+include/opencv5/opencv2/core/cuda/filters.hpp
+include/opencv5/opencv2/core/cuda/funcattrib.hpp
+include/opencv5/opencv2/core/cuda/functional.hpp
+include/opencv5/opencv2/core/cuda/limits.hpp
+include/opencv5/opencv2/core/cuda/reduce.hpp
+include/opencv5/opencv2/core/cuda/saturate_cast.hpp
+include/opencv5/opencv2/core/cuda/scan.hpp
+include/opencv5/opencv2/core/cuda/simd_functions.hpp
+include/opencv5/opencv2/core/cuda/transform.hpp
+include/opencv5/opencv2/core/cuda/type_traits.hpp
+include/opencv5/opencv2/core/cuda/utility.hpp
+include/opencv5/opencv2/core/cuda/vec_distance.hpp
+include/opencv5/opencv2/core/cuda/vec_math.hpp
+include/opencv5/opencv2/core/cuda/vec_traits.hpp
+include/opencv5/opencv2/core/cuda/warp.hpp
+include/opencv5/opencv2/core/cuda/warp_reduce.hpp
+include/opencv5/opencv2/core/cuda/warp_shuffle.hpp
+include/opencv5/opencv2/core/cuda_stream_accessor.hpp
+include/opencv5/opencv2/core/cuda_types.hpp
+include/opencv5/opencv2/core/cv_cpu_dispatch.h
+include/opencv5/opencv2/core/cv_cpu_helper.h
+include/opencv5/opencv2/core/cvdef.h
+include/opencv5/opencv2/core/cvstd.hpp
+include/opencv5/opencv2/core/cvstd.inl.hpp
+include/opencv5/opencv2/core/cvstd_wrapper.hpp
+include/opencv5/opencv2/core/detail/async_promise.hpp
+include/opencv5/opencv2/core/detail/dispatch_helper.impl.hpp
+include/opencv5/opencv2/core/detail/exception_ptr.hpp
+include/opencv5/opencv2/core/directx.hpp
+include/opencv5/opencv2/core/dualquaternion.hpp
+include/opencv5/opencv2/core/dualquaternion.inl.hpp
+include/opencv5/opencv2/core/eigen.hpp
+include/opencv5/opencv2/core/exception.hpp
+include/opencv5/opencv2/core/fast_math.hpp
+include/opencv5/opencv2/core/fwddecl.hpp
+include/opencv5/opencv2/core/hal/hal.hpp
+include/opencv5/opencv2/core/hal/interface.h
+include/opencv5/opencv2/core/hal/intrin.hpp
+include/opencv5/opencv2/core/hal/intrin_avx.hpp
+include/opencv5/opencv2/core/hal/intrin_avx512.hpp
+include/opencv5/opencv2/core/hal/intrin_cpp.hpp
+include/opencv5/opencv2/core/hal/intrin_forward.hpp
+include/opencv5/opencv2/core/hal/intrin_lasx.hpp
+include/opencv5/opencv2/core/hal/intrin_legacy_ops.h
+include/opencv5/opencv2/core/hal/intrin_lsx.hpp
+include/opencv5/opencv2/core/hal/intrin_math.hpp
+include/opencv5/opencv2/core/hal/intrin_msa.hpp
+include/opencv5/opencv2/core/hal/intrin_neon.hpp
+include/opencv5/opencv2/core/hal/intrin_rvv071.hpp
+include/opencv5/opencv2/core/hal/intrin_rvv_scalable.hpp
+include/opencv5/opencv2/core/hal/intrin_sse.hpp
+include/opencv5/opencv2/core/hal/intrin_sse_em.hpp
+include/opencv5/opencv2/core/hal/intrin_vsx.hpp
+include/opencv5/opencv2/core/hal/intrin_wasm.hpp
+include/opencv5/opencv2/core/hal/msa_macros.h
+include/opencv5/opencv2/core/hal/simd_utils.impl.hpp
+include/opencv5/opencv2/core/mat.hpp
+include/opencv5/opencv2/core/mat.inl.hpp
+include/opencv5/opencv2/core/matx.hpp
+include/opencv5/opencv2/core/matx.inl.hpp
+include/opencv5/opencv2/core/neon_utils.hpp
+include/opencv5/opencv2/core/ocl.hpp
+include/opencv5/opencv2/core/ocl_genbase.hpp
+include/opencv5/opencv2/core/opencl/ocl_defs.hpp
+include/opencv5/opencv2/core/opencl/opencl_info.hpp
+include/opencv5/opencv2/core/opencl/opencl_svm.hpp
+include/opencv5/opencv2/core/opencl/runtime/autogenerated/opencl_clblas.hpp
+include/opencv5/opencv2/core/opencl/runtime/autogenerated/opencl_clfft.hpp
+include/opencv5/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
+include/opencv5/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp
+include/opencv5/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
+include/opencv5/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp
+include/opencv5/opencv2/core/opencl/runtime/opencl_clblas.hpp
+include/opencv5/opencv2/core/opencl/runtime/opencl_clfft.hpp
+include/opencv5/opencv2/core/opencl/runtime/opencl_core.hpp
+include/opencv5/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp
+include/opencv5/opencv2/core/opencl/runtime/opencl_gl.hpp
+include/opencv5/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp
+include/opencv5/opencv2/core/opencl/runtime/opencl_svm_20.hpp
+include/opencv5/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp
+include/opencv5/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp
+include/opencv5/opencv2/core/opengl.hpp
+include/opencv5/opencv2/core/operations.hpp
+include/opencv5/opencv2/core/optim.hpp
+include/opencv5/opencv2/core/parallel/backend/parallel_for.openmp.hpp
+include/opencv5/opencv2/core/parallel/backend/parallel_for.tbb.hpp
+include/opencv5/opencv2/core/parallel/parallel_backend.hpp
+include/opencv5/opencv2/core/persistence.hpp
+include/opencv5/opencv2/core/quaternion.hpp
+include/opencv5/opencv2/core/quaternion.inl.hpp
+include/opencv5/opencv2/core/saturate.hpp
+include/opencv5/opencv2/core/simd_intrinsics.hpp
+include/opencv5/opencv2/core/softfloat.hpp
+include/opencv5/opencv2/core/traits.hpp
+include/opencv5/opencv2/core/types.hpp
+include/opencv5/opencv2/core/utility.hpp
+include/opencv5/opencv2/core/utils/allocator_stats.hpp
+include/opencv5/opencv2/core/utils/allocator_stats.impl.hpp
+include/opencv5/opencv2/core/utils/filesystem.hpp
+include/opencv5/opencv2/core/utils/fp_control_utils.hpp
+include/opencv5/opencv2/core/utils/instrumentation.hpp
+include/opencv5/opencv2/core/utils/logger.defines.hpp
+include/opencv5/opencv2/core/utils/logger.hpp
+include/opencv5/opencv2/core/utils/logtag.hpp
+include/opencv5/opencv2/core/utils/tls.hpp
+include/opencv5/opencv2/core/utils/trace.hpp
+include/opencv5/opencv2/core/va_intel.hpp
+include/opencv5/opencv2/core/version.hpp
+include/opencv5/opencv2/core/vsx_utils.hpp
+include/opencv5/opencv2/cvconfig.h
+include/opencv5/opencv2/dnn.hpp
+include/opencv5/opencv2/dnn/all_layers.hpp
+include/opencv5/opencv2/dnn/dict.hpp
+include/opencv5/opencv2/dnn/dnn.hpp
+include/opencv5/opencv2/dnn/dnn.inl.hpp
+include/opencv5/opencv2/dnn/layer.details.hpp
+include/opencv5/opencv2/dnn/layer.hpp
+include/opencv5/opencv2/dnn/shape_utils.hpp
+include/opencv5/opencv2/dnn/utils/debug_utils.hpp
+include/opencv5/opencv2/dnn/utils/inference_engine.hpp
+include/opencv5/opencv2/dnn/version.hpp
+include/opencv5/opencv2/features.hpp
+include/opencv5/opencv2/features/features.hpp
+include/opencv5/opencv2/features/hal/interface.h
+include/opencv5/opencv2/features2d.hpp
+include/opencv5/opencv2/flann.hpp
+include/opencv5/opencv2/flann/all_indices.h
+include/opencv5/opencv2/flann/allocator.h
+include/opencv5/opencv2/flann/any.h
+include/opencv5/opencv2/flann/autotuned_index.h
+include/opencv5/opencv2/flann/composite_index.h
+include/opencv5/opencv2/flann/config.h
+include/opencv5/opencv2/flann/defines.h
+include/opencv5/opencv2/flann/dist.h
+include/opencv5/opencv2/flann/dummy.h
+include/opencv5/opencv2/flann/dynamic_bitset.h
+include/opencv5/opencv2/flann/flann.hpp
+include/opencv5/opencv2/flann/flann_base.hpp
+include/opencv5/opencv2/flann/general.h
+include/opencv5/opencv2/flann/ground_truth.h
+include/opencv5/opencv2/flann/heap.h
+include/opencv5/opencv2/flann/hierarchical_clustering_index.h
+include/opencv5/opencv2/flann/index_testing.h
+include/opencv5/opencv2/flann/kdtree_index.h
+include/opencv5/opencv2/flann/kdtree_single_index.h
+include/opencv5/opencv2/flann/kmeans_index.h
+include/opencv5/opencv2/flann/linear_index.h
+include/opencv5/opencv2/flann/logger.h
+include/opencv5/opencv2/flann/lsh_index.h
+include/opencv5/opencv2/flann/lsh_table.h
+include/opencv5/opencv2/flann/matrix.h
+include/opencv5/opencv2/flann/miniflann.hpp
+include/opencv5/opencv2/flann/nn_index.h
+include/opencv5/opencv2/flann/object_factory.h
+include/opencv5/opencv2/flann/params.h
+include/opencv5/opencv2/flann/random.h
+include/opencv5/opencv2/flann/result_set.h
+include/opencv5/opencv2/flann/sampling.h
+include/opencv5/opencv2/flann/saving.h
+include/opencv5/opencv2/flann/simplex_downhill.h
+include/opencv5/opencv2/flann/timer.h
+include/opencv5/opencv2/geometry.hpp
+include/opencv5/opencv2/geometry/2d.hpp
+include/opencv5/opencv2/geometry/3d.hpp
+include/opencv5/opencv2/geometry/detail/gcgraph.hpp
+include/opencv5/opencv2/geometry/detail/optimizer.hpp
+include/opencv5/opencv2/geometry/mst.hpp
+include/opencv5/opencv2/geometry/segment.hpp
+include/opencv5/opencv2/highgui.hpp
+include/opencv5/opencv2/highgui/highgui.hpp
+include/opencv5/opencv2/highgui/highgui_winrt.hpp
+include/opencv5/opencv2/imgcodecs.hpp
+include/opencv5/opencv2/imgcodecs/imgcodecs.hpp
+include/opencv5/opencv2/imgcodecs/ios.h
+include/opencv5/opencv2/imgcodecs/macosx.h
+include/opencv5/opencv2/imgproc.hpp
+include/opencv5/opencv2/imgproc/bindings.hpp
+include/opencv5/opencv2/imgproc/hal/hal.hpp
+include/opencv5/opencv2/imgproc/hal/interface.h
+include/opencv5/opencv2/imgproc/imgproc.hpp
+include/opencv5/opencv2/objdetect.hpp
+include/opencv5/opencv2/objdetect/aruco_board.hpp
+include/opencv5/opencv2/objdetect/aruco_detector.hpp
+include/opencv5/opencv2/objdetect/aruco_dictionary.hpp
+include/opencv5/opencv2/objdetect/barcode.hpp
+include/opencv5/opencv2/objdetect/charuco_detector.hpp
+include/opencv5/opencv2/objdetect/face.hpp
+include/opencv5/opencv2/objdetect/graphical_code_detector.hpp
+include/opencv5/opencv2/objdetect/mcc_checker_detector.hpp
+include/opencv5/opencv2/objdetect/objdetect.hpp
+include/opencv5/opencv2/opencv.hpp
+include/opencv5/opencv2/opencv_modules.hpp
+include/opencv5/opencv2/photo.hpp
+include/opencv5/opencv2/photo/ccm.hpp
+include/opencv5/opencv2/photo/cuda.hpp
+include/opencv5/opencv2/photo/legacy/constants_c.h
+include/opencv5/opencv2/photo/photo.hpp
+include/opencv5/opencv2/photo/segmentation.hpp
+include/opencv5/opencv2/ptcloud.hpp
+include/opencv5/opencv2/ptcloud/depth.hpp
+include/opencv5/opencv2/ptcloud/detail/kinfu_frame.hpp
+include/opencv5/opencv2/ptcloud/detail/pose_graph.hpp
+include/opencv5/opencv2/ptcloud/detail/submap.hpp
+include/opencv5/opencv2/ptcloud/odometry.hpp
+include/opencv5/opencv2/ptcloud/odometry_frame.hpp
+include/opencv5/opencv2/ptcloud/odometry_settings.hpp
+include/opencv5/opencv2/ptcloud/volume.hpp
+include/opencv5/opencv2/ptcloud/volume_settings.hpp
+include/opencv5/opencv2/stereo.hpp
+include/opencv5/opencv2/stitching.hpp
+include/opencv5/opencv2/stitching/detail/autocalib.hpp
+include/opencv5/opencv2/stitching/detail/blenders.hpp
+include/opencv5/opencv2/stitching/detail/camera.hpp
+include/opencv5/opencv2/stitching/detail/exposure_compensate.hpp
+include/opencv5/opencv2/stitching/detail/matchers.hpp
+include/opencv5/opencv2/stitching/detail/motion_estimators.hpp
+include/opencv5/opencv2/stitching/detail/seam_finders.hpp
+include/opencv5/opencv2/stitching/detail/timelapsers.hpp
+include/opencv5/opencv2/stitching/detail/util.hpp
+include/opencv5/opencv2/stitching/detail/util_inl.hpp
+include/opencv5/opencv2/stitching/detail/warpers.hpp
+include/opencv5/opencv2/stitching/detail/warpers_inl.hpp
+include/opencv5/opencv2/stitching/warpers.hpp
+include/opencv5/opencv2/video.hpp
+include/opencv5/opencv2/video/background_segm.hpp
+include/opencv5/opencv2/video/detail/tracking.detail.hpp
+include/opencv5/opencv2/video/legacy/constants_c.h
+include/opencv5/opencv2/video/tracking.hpp
+include/opencv5/opencv2/video/video.hpp
+include/opencv5/opencv2/videoio.hpp
+include/opencv5/opencv2/videoio/registry.hpp
+include/opencv5/opencv2/videoio/videoio.hpp
+lib/cmake/opencv5/OpenCVConfig-version.cmake
+lib/cmake/opencv5/OpenCVConfig.cmake
+lib/cmake/opencv5/OpenCVModules-release.cmake
+lib/cmake/opencv5/OpenCVModules.cmake
+lib/libopencv_calib.so
+lib/libopencv_calib.so.${PKGVERSION}
+lib/libopencv_calib.so.500
lib/libopencv_core.so
lib/libopencv_core.so.${PKGVERSION}
-lib/libopencv_core.so.413
+lib/libopencv_core.so.500
lib/libopencv_dnn.so
lib/libopencv_dnn.so.${PKGVERSION}
-lib/libopencv_dnn.so.413
-lib/libopencv_features2d.so
-lib/libopencv_features2d.so.${PKGVERSION}
-lib/libopencv_features2d.so.413
+lib/libopencv_dnn.so.500
+lib/libopencv_features.so
+lib/libopencv_features.so.${PKGVERSION}
+lib/libopencv_features.so.500
lib/libopencv_flann.so
lib/libopencv_flann.so.${PKGVERSION}
-lib/libopencv_flann.so.413
+lib/libopencv_flann.so.500
+lib/libopencv_geometry.so
+lib/libopencv_geometry.so.${PKGVERSION}
+lib/libopencv_geometry.so.500
lib/libopencv_highgui.so
lib/libopencv_highgui.so.${PKGVERSION}
-lib/libopencv_highgui.so.413
+lib/libopencv_highgui.so.500
lib/libopencv_imgcodecs.so
lib/libopencv_imgcodecs.so.${PKGVERSION}
-lib/libopencv_imgcodecs.so.413
+lib/libopencv_imgcodecs.so.500
lib/libopencv_imgproc.so
lib/libopencv_imgproc.so.${PKGVERSION}
-lib/libopencv_imgproc.so.413
-lib/libopencv_ml.so
-lib/libopencv_ml.so.${PKGVERSION}
-lib/libopencv_ml.so.413
+lib/libopencv_imgproc.so.500
lib/libopencv_objdetect.so
lib/libopencv_objdetect.so.${PKGVERSION}
-lib/libopencv_objdetect.so.413
+lib/libopencv_objdetect.so.500
lib/libopencv_photo.so
lib/libopencv_photo.so.${PKGVERSION}
-lib/libopencv_photo.so.413
+lib/libopencv_photo.so.500
+lib/libopencv_ptcloud.so
+lib/libopencv_ptcloud.so.${PKGVERSION}
+lib/libopencv_ptcloud.so.500
+lib/libopencv_stereo.so
+lib/libopencv_stereo.so.${PKGVERSION}
+lib/libopencv_stereo.so.500
lib/libopencv_stitching.so
lib/libopencv_stitching.so.${PKGVERSION}
-lib/libopencv_stitching.so.413
+lib/libopencv_stitching.so.500
lib/libopencv_video.so
lib/libopencv_video.so.${PKGVERSION}
-lib/libopencv_video.so.413
+lib/libopencv_video.so.500
lib/libopencv_videoio.so
lib/libopencv_videoio.so.${PKGVERSION}
-lib/libopencv_videoio.so.413
+lib/libopencv_videoio.so.500
${PYSITELIB}/cv2/Error/__init__.pyi
${PYSITELIB}/cv2/__init__.py
${PYSITELIB}/cv2/__init__.pyi
${PYSITELIB}/cv2/aruco/__init__.pyi
${PYSITELIB}/cv2/barcode/__init__.pyi
+${PYSITELIB}/cv2/ccm/__init__.pyi
${PYSITELIB}/cv2/config-${PYVERSSUFFIX}.py
${PYSITELIB}/cv2/config.py
${PYSITELIB}/cv2/cuda/__init__.pyi
@@ -319,9 +329,9 @@ ${PYSITELIB}/cv2/ipp/__init__.pyi
${PYSITELIB}/cv2/load_config_py2.py
${PYSITELIB}/cv2/load_config_py3.py
${PYSITELIB}/cv2/mat_wrapper/__init__.py
+${PYSITELIB}/cv2/mcc/__init__.pyi
${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
@@ -336,34 +346,15 @@ ${PYSITELIB}/cv2/utils/fs/__init__.pyi
${PYSITELIB}/cv2/utils/logging/__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/dlpack-LICENSE
-share/opencv4/licenses/flatbuffers-LICENSE.txt
-share/opencv4/licenses/ittnotify-BSD-3-Clause.txt
-share/opencv4/licenses/ittnotify-GPL-2.0-only.txt
-share/opencv4/licenses/mscr-chi_table_LICENSE.txt
-${PLIST.opencl}share/opencv4/licenses/opencl-headers-LICENSE.txt
-share/opencv4/valgrind.supp
-share/opencv4/valgrind_3rdparty.supp
+share/opencv5/licenses/SoftFloat-COPYING.txt
+share/opencv5/licenses/annoylib-LICENSE
+share/opencv5/licenses/clapack-lapack_LICENSE
+share/opencv5/licenses/dlpack-LICENSE
+share/opencv5/licenses/flatbuffers-LICENSE.txt
+share/opencv5/licenses/fonts-Rubik_OFL.txt
+share/opencv5/licenses/ittnotify-BSD-3-Clause.txt
+share/opencv5/licenses/ittnotify-GPL-2.0-only.txt
+share/opencv5/licenses/mscr-chi_table_LICENSE.txt
+${PLIST.opencl}share/opencv5/licenses/opencl-headers-LICENSE.txt
+share/opencv5/valgrind.supp
+share/opencv5/valgrind_3rdparty.supp
diff --git a/opencv/TODO b/opencv/TODO
deleted file mode 100644
index a38a12e53c..0000000000
--- a/opencv/TODO
+++ /dev/null
@@ -1,133 +0,0 @@
-Needs unapplied-patch merging to modules/videoio/src/cap_v4l.cpp
-
-Doesn't build.
-
-[80/1213] Building CXX object modules/core/CMakeFiles/opencv_core.dir/src/hal_internal.cpp.o
-FAILED: [code=1] modules/core/CMakeFiles/opencv_core.dir/src/hal_internal.cpp.o
-/tmp/graphics/opencv/work/.cwrapper/bin/c++ -DCVAPI_EXPORTS -DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE="long long" -DOPENCV_WITH_ITT=1 -D_USE_MATH_DEFINES -D__OPENCV_BUILD=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_
-_STDC_LIMIT_MACROS -I/tmp/graphics/opencv/work/opencv-5.0.0/3rdparty/dlpack/include -I/tmp/graphics/opencv/work/opencv-5.0.0/cmake-pkgsrc-build -I/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/include -I/tmp/graphic
-s/opencv/work/opencv-5.0.0/cmake-pkgsrc-build/modules/core -I/tmp/graphics/opencv/work/opencv-5.0.0/3rdparty/include/opencl/1.2 -I/tmp/graphics/opencv/work/opencv-5.0.0/3rdparty/ittnotify/include -O2 -g -fstack-clash-pro
-tection -I/usr/include -I/usr/pkg/include/python3.14 -I/usr/pkg/include -I/usr/pkg/include/glib-2.0 -I/usr/pkg/include/gio-unix-2.0 -I/usr/pkg/lib/glib-2.0/include -I/usr/pkg/include/freetype2 -I/usr/pkg/include/harfbuzz
- -I/usr/pkg/include/libdrm -g -fsigned-char -W -Wall -Wreturn-type -Wnon-virtual-dtor -Waddress -Wsequence-point -Wformat -Wformat-security -Wmissing-declarations -Wundef -Winit-self -Wpointer-arith -Wshadow -Wsign-pro
-mo -Wuninitialized -Wsuggest-override -Wno-delete-non-virtual-dtor -Wno-comment -Wimplicit-fallthrough=3 -Wno-strict-overflow -fdiagnostics-show-option -pthread -fomit-frame-pointer -ffunction-sections -fdata-sections -
-msse3 -fvisibility=hidden -fvisibility-inlines-hidden -DNDEBUG -DNDEBUG -std=c++17 -fPIC -MD -MT modules/core/CMakeFiles/opencv_core.dir/src/hal_internal.cpp.o -MF modules/core/CMakeFiles/opencv_core.dir/src/hal_interna
-l.cpp.o.d -o modules/core/CMakeFiles/opencv_core.dir/src/hal_internal.cpp.o -c /tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp
-In file included from /tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:50:
-/tmp/graphics/opencv/work/opencv-5.0.0/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)':
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:540:48: error: expected unqualified-id before '_Complex'
- 540 | int ldsrc1 = (int)(src1_step / sizeof(std::complex<fptype>));
- | ^~~~~~~
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:540:46: error: expected ')' before '_Complex'
- 540 | int ldsrc1 = (int)(src1_step / sizeof(std::complex<fptype>));
- | ~ ^
- | )
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:540:65: error: expected ')' before ';' token
- 540 | int ldsrc1 = (int)(src1_step / sizeof(std::complex<fptype>));
- | ~ ^
- | )
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:541:48: error: expected unqualified-id before '_Complex'
- 541 | int ldsrc2 = (int)(src2_step / sizeof(std::complex<fptype>));
- | ^~~~~~~
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:541:46: error: expected ')' before '_Complex'
- 541 | int ldsrc2 = (int)(src2_step / sizeof(std::complex<fptype>));
- | ~ ^
- | )
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:541:65: error: expected ')' before ';' token
- 541 | int ldsrc2 = (int)(src2_step / sizeof(std::complex<fptype>));
- | ~ ^
- | )
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:542:48: error: expected unqualified-id before '_Complex'
- 542 | int ldsrc3 = (int)(src3_step / sizeof(std::complex<fptype>));
- | ^~~~~~~
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:542:46: error: expected ')' before '_Complex'
- 542 | int ldsrc3 = (int)(src3_step / sizeof(std::complex<fptype>));
- | ~ ^
- | )
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:542:65: error: expected ')' before ';' token
- 542 | int ldsrc3 = (int)(src3_step / sizeof(std::complex<fptype>));
- | ~ ^
- | )
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:543:46: error: expected unqualified-id before '_Complex'
- 543 | int lddst = (int)(dst_step / sizeof(std::complex<fptype>));
- | ^~~~~~~
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:543:44: error: expected ')' before '_Complex'
- 543 | int lddst = (int)(dst_step / sizeof(std::complex<fptype>));
- | ~ ^
- | )
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:543:63: error: expected ')' before ';' token
- 543 | int lddst = (int)(dst_step / sizeof(std::complex<fptype>));
- | ~ ^
- | )
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:546:10: error: expected unqualified-id before '_Complex'
- 546 | std::complex<fptype> cAlpha(alpha, 0.0);
- | ^~~~~~~
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:547:10: error: expected unqualified-id before '_Complex'
- 547 | std::complex<fptype> cBeta(beta, 0.0);
- | ^~~~~~~
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:597:29: error: expected unqualified-id before '_Complex'
- 597 | transpose((std::complex<fptype>*)src3, ldsrc3, (std::complex<fptype>*)dst, lddst, c_m, c_n);
- | ^~~~~~~
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:597:27: error: expected ')' before '_Complex'
- 597 | transpose((std::complex<fptype>*)src3, ldsrc3, (std::complex<fptype>*)dst, lddst, c_m, c_n);
- | ~ ^
- | )
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:599:31: error: expected unqualified-id before '_Complex'
- 599 | copy_matrix((std::complex<fptype>*)src3, ldsrc3, (std::complex<fptype>*)dst, lddst, c_m, c_n);
- | ^~~~~~~
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:599:29: error: expected ')' before '_Complex'
- 599 | copy_matrix((std::complex<fptype>*)src3, ldsrc3, (std::complex<fptype>*)dst, lddst, c_m, c_n);
- | ~ ^
- | )
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:604:25: error: expected unqualified-id before '_Complex'
- 604 | set_value((std::complex<fptype>*)dst, lddst, std::complex<fptype>(0.0, 0.0), d_m, d_n);
- | ^~~~~~~
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:604:23: error: expected ')' before '_Complex'
- 604 | set_value((std::complex<fptype>*)dst, lddst, std::complex<fptype>(0.0, 0.0), d_m, d_n);
- | ~ ^
- | )
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:625:106: error: 'cAlpha' was not declared in this scope; did you mean 'alpha'?
- 625 | cblas_cgemm(CblasRowMajor, transA, transB, a_m, d_n, a_n, (float*)reinterpret_cast<fptype(&)[2]>(cAlpha), (float*)src1, ldsrc1, (float*)src2, ldsrc2, (float*)reinterpret_cast<fptype(&)[2]>(cBeta), (float*
-)dst, lddst);
- | ^~~~~~
- | alpha
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:625:198: error: 'cBeta' was not declared in this scope
- 625 | cblas_cgemm(CblasRowMajor, transA, transB, a_m, d_n, a_n, (float*)reinterpret_cast<fptype(&)[2]>(cAlpha), (float*)src1, ldsrc1, (float*)src2, ldsrc2, (float*)reinterpret_cast<fptype(&)[2]>(cBeta), (float*
-)dst, lddst);
- | ^~~~~
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:627:107: error: 'cAlpha' was not declared in this scope; did you mean 'alpha'?
- 627 | cblas_zgemm(CblasRowMajor, transA, transB, a_m, d_n, a_n, (double*)reinterpret_cast<fptype(&)[2]>(cAlpha), (double*)src1, ldsrc1, (double*)src2, ldsrc2, (double*)reinterpret_cast<fptype(&)[2]>(cBeta), (do
-uble*)dst, lddst);
- | ^~~~~~
- | alpha
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:627:202: error: 'cBeta' was not declared in this scope
- 627 | cblas_zgemm(CblasRowMajor, transA, transB, a_m, d_n, a_n, (double*)reinterpret_cast<fptype(&)[2]>(cAlpha), (double*)src1, ldsrc1, (double*)src2, ldsrc2, (double*)reinterpret_cast<fptype(&)[2]>(cBeta), (do
-uble*)dst, lddst);
- | ^~~~~
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp: In instantiation of '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) [with fptype = float; size_t = long unsigned int]':
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:711:25: required from here
- 711 | return lapack_gemm_c(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m, n, k, flags);
- | ~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:542:9: warning: unused variable 'ldsrc3' [-Wunused-variable]
- 542 | int ldsrc3 = (int)(src3_step / sizeof(std::complex<fptype>));
- | ^~~~~~
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:537:98: warning: unused parameter 'alpha' [-Wunused-parameter]
- 537 | lapack_gemm_c(const fptype *src1, size_t src1_step, const fptype *src2, size_t src2_step, fptype alpha,
- | ~~~~~~~^~~~~
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp: In instantiation of '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) [with fptype = double; size_t = long unsigned int]':
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:718:25: required from here
- 718 | return lapack_gemm_c(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m, n, k, flags);
- | ~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:542:9: warning: unused variable 'ldsrc3' [-Wunused-variable]
- 542 | int ldsrc3 = (int)(src3_step / sizeof(std::complex<fptype>));
- | ^~~~~~
-/tmp/graphics/opencv/work/opencv-5.0.0/modules/core/src/hal_internal.cpp:537:98: warning: unused parameter 'alpha' [-Wunused-parameter]
- 537 | lapack_gemm_c(const fptype *src1, size_t src1_step, const fptype *src2, size_t src2_step, fptype alpha,
- | ~~~~~~~^~~~~
-[95/1213] Building CXX object modules/core/CMakeFiles/opencv_core.dir/src/dxt.cpp.o
-ninja: build stopped: subcommand failed.
-*** Error code 1
-
-https://github.com/opencv/opencv/issues/29452
diff --git a/opencv/buildlink3.mk b/opencv/buildlink3.mk
index 7b288bf503..46545e4a82 100644
--- a/opencv/buildlink3.mk
+++ b/opencv/buildlink3.mk
@@ -7,7 +7,7 @@ OPENCV_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.opencv+= opencv>=3.0.0
BUILDLINK_ABI_DEPENDS.opencv+= opencv>=4.13.0nb6
-BUILDLINK_PKGSRCDIR.opencv?= ../../graphics/opencv
+BUILDLINK_PKGSRCDIR.opencv?= ../../wip/opencv
BUILDLINK_INCDIRS.opencv+= include/opencv4
diff --git a/opencv/distinfo b/opencv/distinfo
index a3a943a551..5844a5aad7 100644
--- a/opencv/distinfo
+++ b/opencv/distinfo
@@ -5,7 +5,17 @@ SHA512 (opencv-5.0.0.tar.gz) = 37143de2ba76a9af351d6901358635b42b671b5fbe3ccc75d
Size (opencv-5.0.0.tar.gz) = 81594270 bytes
SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
+SHA1 (patch-modules_core_src_hal__internal.cpp) = 0f243428337a6e60a8f72cd579941099081d2ecd
SHA1 (patch-modules_core_src_system.cpp) = e7e5c7eb79d875556a380bff19d03434ae46553b
+SHA1 (patch-modules_dnn_CMakeLists.txt) = 83c6df64a478699b6916484525ced06978b780f8
+SHA1 (patch-modules_dnn_src_glog__emulator.hpp) = 823d844eb53bd132143aecdddcb13167594cc82d
+SHA1 (patch-modules_dnn_src_layers_cast2__layer.cpp) = 09b01b34a9d4656bd6fc7f542d477a909e0a1632
+SHA1 (patch-modules_dnn_src_ocl4dnn_include_common.hpp) = 896d66971a91c7b7e978d1a21c5fd62e2809f492
+SHA1 (patch-modules_dnn_src_onnx_onnx__importer.cpp) = 1661d29cfa8e68a893728c9eb4b18c5e6b435dbc
+SHA1 (patch-modules_dnn_src_protobuf__io.cpp) = d9b379c9bf5a778d1beea80589ac143bbfbd1ec7
+SHA1 (patch-modules_dnn_src_protobuf__io.hpp) = 34003fee294288aa226cf6ddd9ba768a6b017fba
+SHA1 (patch-modules_dnn_src_tensorflow_tf__importer.cpp) = 0af04a2c2fced4f5b8d6d4f334c7c99506ba8f95
+SHA1 (patch-modules_dnn_src_tensorflow_tf__io.cpp) = 114c912ed00ff0f7978f56fb4ca146fac1065e63
SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
SHA1 (patch-modules_imgproc_src_resize.cpp) = e842d5960c4c00162a34f46cb45cf69d0e9f21ce
SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 362fe667a8b5ee9d556036ef97121eb5ff503602
diff --git a/opencv/patches/patch-modules_core_src_hal__internal.cpp b/opencv/patches/patch-modules_core_src_hal__internal.cpp
new file mode 100644
index 0000000000..f533ac206c
--- /dev/null
+++ b/opencv/patches/patch-modules_core_src_hal__internal.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Remove complex.h to fix build.
+https://github.com/opencv/opencv/pull/29455
+
+--- modules/core/src/hal_internal.cpp.orig 2026-06-05 18:50:05.000000000 +0000
++++ modules/core/src/hal_internal.cpp
+@@ -47,7 +47,6 @@
+
+ #ifdef HAVE_LAPACK
+
+-#include <complex.h>
+ #include "opencv_lapack.h"
+
+ #include <cmath>
diff --git a/opencv/patches/patch-modules_dnn_CMakeLists.txt b/opencv/patches/patch-modules_dnn_CMakeLists.txt
new file mode 100644
index 0000000000..dcabead16c
--- /dev/null
+++ b/opencv/patches/patch-modules_dnn_CMakeLists.txt
@@ -0,0 +1,37 @@
+$NetBSD$
+
+https://github.com/fkenmar/opencv/commit/142801f769ed4946a161f62738bac5a5fe56a60f
+
+--- modules/dnn/CMakeLists.txt.orig 2026-06-05 18:50:05.000000000 +0000
++++ modules/dnn/CMakeLists.txt
+@@ -109,7 +109,7 @@ endif()
+ ocv_target_compile_definitions(${the_module} PRIVATE "OPENCV_DNN_EXTERNAL_PROTOBUF=1")
+ endif()
+
+-#suppress warnings in autogenerated caffe.pb.* files
++#suppress warnings in autogenerated *.pb.* files
+ ocv_warnings_disable(CMAKE_CXX_FLAGS
+ /wd4125 /wd4267 /wd4127 /wd4244 /wd4512 /wd4702
+ /wd4456 /wd4510 /wd4610 /wd4800
+@@ -411,9 +411,9 @@ if(HAVE_PROTOBUF)
+ list(FILTER fw_hdrs INCLUDE REGEX ".+\.h$")
+ endif()
+ else()
+- file(GLOB fw_srcs "${CMAKE_CURRENT_LIST_DIR}/misc/tensorflow/*.cc" "${CMAKE_CURRENT_LIST_DIR}/misc/caffe/opencv-caffe.pb.cc" "${CMAKE_CURRENT_LIST_DIR}/misc/onnx/opencv-onnx.pb.cc")
+- file(GLOB fw_hdrs "${CMAKE_CURRENT_LIST_DIR}/misc/tensorflow/*.h" "${CMAKE_CURRENT_LIST_DIR}/misc/caffe/opencv-caffe.pb.h" "${CMAKE_CURRENT_LIST_DIR}/misc/onnx/opencv-onnx.pb.h")
+- set(fw_inc "${CMAKE_CURRENT_LIST_DIR}/misc/caffe" "${CMAKE_CURRENT_LIST_DIR}/misc/tensorflow" "${CMAKE_CURRENT_LIST_DIR}/misc/onnx")
++ file(GLOB fw_srcs "${CMAKE_CURRENT_LIST_DIR}/misc/tensorflow/*.cc" "${CMAKE_CURRENT_LIST_DIR}/misc/onnx/opencv-onnx.pb.cc")
++ file(GLOB fw_hdrs "${CMAKE_CURRENT_LIST_DIR}/misc/tensorflow/*.h" "${CMAKE_CURRENT_LIST_DIR}/misc/onnx/opencv-onnx.pb.h")
++ set(fw_inc "${CMAKE_CURRENT_LIST_DIR}/misc/tensorflow" "${CMAKE_CURRENT_LIST_DIR}/misc/onnx")
+ endif()
+ endif()
+
+@@ -532,7 +532,7 @@ ocv_list_filterout_ex(dnn_plugin_srcs
+ ocv_list_filterout_ex(dnn_plugin_srcs
+ "/src/dnn.cpp$|/src/dnn_utils.cpp$|/src/dnn_read.cpp$|/src/registry.cpp$|/src/backend.cpp$"
+ # importers
+- "/src/(caffe|onnx|tensorflow)/"
++ "/src/(onnx|tensorflow)/|/src/protobuf_io.cpp$"
+ # executors
+ "/src/(cuda|cuda4dnn|ocl4dnn|vkcom|webnn)/"
+ )
diff --git a/opencv/patches/patch-modules_dnn_src_glog__emulator.hpp b/opencv/patches/patch-modules_dnn_src_glog__emulator.hpp
new file mode 100644
index 0000000000..9abe75da83
--- /dev/null
+++ b/opencv/patches/patch-modules_dnn_src_glog__emulator.hpp
@@ -0,0 +1,17 @@
+$NetBSD$
+
+https://github.com/fkenmar/opencv/commit/142801f769ed4946a161f62738bac5a5fe56a60f
+
+--- modules/dnn/src/glog_emulator.hpp.orig 2026-06-05 18:50:05.000000000 +0000
++++ modules/dnn/src/glog_emulator.hpp
+@@ -39,8 +39,8 @@
+ //
+ //M*/
+
+-#ifndef __OPENCV_DNN_CAFFE_GLOG_EMULATOR_HPP__
+-#define __OPENCV_DNN_CAFFE_GLOG_EMULATOR_HPP__
++#ifndef __OPENCV_DNN_GLOG_EMULATOR_HPP__
++#define __OPENCV_DNN_GLOG_EMULATOR_HPP__
+ #include <cstdlib>
+ #include <iostream>
+ #include <sstream>
diff --git a/opencv/patches/patch-modules_dnn_src_layers_cast2__layer.cpp b/opencv/patches/patch-modules_dnn_src_layers_cast2__layer.cpp
new file mode 100644
index 0000000000..17476aaf66
--- /dev/null
+++ b/opencv/patches/patch-modules_dnn_src_layers_cast2__layer.cpp
@@ -0,0 +1,66 @@
+$NetBSD$
+
+https://github.com/fkenmar/opencv/commit/142801f769ed4946a161f62738bac5a5fe56a60f
+
+--- modules/dnn/src/layers/cast2_layer.cpp.orig 2026-06-05 18:50:05.000000000 +0000
++++ modules/dnn/src/layers/cast2_layer.cpp
+@@ -8,8 +8,6 @@
+ #include "layers_common.hpp"
+ #include "../net_impl.hpp"
+
+-#include "opencv-onnx.pb.h"
+-
+ namespace cv { namespace dnn {
+
+ // ONNX Cast operator
+@@ -367,21 +365,39 @@ class Cast2LayerImpl CV_FINAL : public Cast2Layer (pri
+ bool hasToParam = false;
+ int toCvDepth_ = -1;
+
++ // ONNX TensorProto::DataType values (see opencv-onnx.proto); the 'to'
++ // attribute stores the raw ONNX value. Fixed by the ONNX specification,
++ // duplicated here to keep this layer independent of protobuf-generated headers.
++ enum OnnxDataType
++ {
++ ONNX_DT_FLOAT = 1,
++ ONNX_DT_UINT8 = 2,
++ ONNX_DT_INT8 = 3,
++ ONNX_DT_UINT16 = 4,
++ ONNX_DT_INT16 = 5,
++ ONNX_DT_INT32 = 6,
++ ONNX_DT_INT64 = 7,
++ ONNX_DT_BOOL = 9,
++ ONNX_DT_FLOAT16 = 10,
++ ONNX_DT_DOUBLE = 11,
++ ONNX_DT_BFLOAT16 = 16
++ };
++
+ static int mapToCvDepth(int v)
+ {
+ switch (v)
+ {
+- case opencv_onnx::TensorProto_DataType_FLOAT: return CV_32F;
+- case opencv_onnx::TensorProto_DataType_UINT8: return CV_8U;
+- case opencv_onnx::TensorProto_DataType_INT8: return CV_8S;
+- case opencv_onnx::TensorProto_DataType_UINT16: return CV_16U;
+- case opencv_onnx::TensorProto_DataType_INT16: return CV_16S;
+- case opencv_onnx::TensorProto_DataType_INT32: return CV_32S;
+- case opencv_onnx::TensorProto_DataType_INT64: return CV_64S;
+- case opencv_onnx::TensorProto_DataType_BOOL: return CV_Bool;
+- case opencv_onnx::TensorProto_DataType_FLOAT16: return CV_16F;
+- case opencv_onnx::TensorProto_DataType_DOUBLE: return CV_64F;
+- case opencv_onnx::TensorProto_DataType_BFLOAT16: return CV_16BF;
++ case ONNX_DT_FLOAT: return CV_32F;
++ case ONNX_DT_UINT8: return CV_8U;
++ case ONNX_DT_INT8: return CV_8S;
++ case ONNX_DT_UINT16: return CV_16U;
++ case ONNX_DT_INT16: return CV_16S;
++ case ONNX_DT_INT32: return CV_32S;
++ case ONNX_DT_INT64: return CV_64S;
++ case ONNX_DT_BOOL: return CV_Bool;
++ case ONNX_DT_FLOAT16: return CV_16F;
++ case ONNX_DT_DOUBLE: return CV_64F;
++ case ONNX_DT_BFLOAT16: return CV_16BF;
+ default: break;
+ }
+
diff --git a/opencv/patches/patch-modules_dnn_src_ocl4dnn_include_common.hpp b/opencv/patches/patch-modules_dnn_src_ocl4dnn_include_common.hpp
new file mode 100644
index 0000000000..77b441e7f5
--- /dev/null
+++ b/opencv/patches/patch-modules_dnn_src_ocl4dnn_include_common.hpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+https://github.com/fkenmar/opencv/commit/142801f769ed4946a161f62738bac5a5fe56a60f
+
+--- modules/dnn/src/ocl4dnn/include/common.hpp.orig 2026-06-05 18:50:05.000000000 +0000
++++ modules/dnn/src/ocl4dnn/include/common.hpp
+@@ -41,7 +41,7 @@
+
+ #ifndef _OPENCV_LIBDNN_COMMON_HPP_
+ #define _OPENCV_LIBDNN_COMMON_HPP_
+-#include "../../caffe/glog_emulator.hpp"
++#include "../../glog_emulator.hpp"
+ #include <opencv2/core/opencl/runtime/opencl_core.hpp>
+
+ // Macro to select the single (_float) or double (_double) precision kernel
diff --git a/opencv/patches/patch-modules_dnn_src_onnx_onnx__importer.cpp b/opencv/patches/patch-modules_dnn_src_onnx_onnx__importer.cpp
new file mode 100644
index 0000000000..9b93545bcb
--- /dev/null
+++ b/opencv/patches/patch-modules_dnn_src_onnx_onnx__importer.cpp
@@ -0,0 +1,25 @@
+$NetBSD$
+
+https://github.com/fkenmar/opencv/commit/142801f769ed4946a161f62738bac5a5fe56a60f
+
+--- modules/dnn/src/onnx/onnx_importer.cpp.orig 2026-06-05 18:50:05.000000000 +0000
++++ modules/dnn/src/onnx/onnx_importer.cpp
+@@ -4320,15 +4320,15 @@ Mat readTensorFromONNX(const String& path)
+
+ #define DNN_PROTOBUF_UNSUPPORTED() CV_Error(Error::StsError, "DNN/ONNX: Build OpenCV with Protobuf to import ONNX models")
+
+-Net readNetFromONNX(const String&) {
++Net readNetFromONNX(const String&, int) {
+ DNN_PROTOBUF_UNSUPPORTED();
+ }
+
+-Net readNetFromONNX(const char*, size_t) {
++Net readNetFromONNX(const char*, size_t, int) {
+ DNN_PROTOBUF_UNSUPPORTED();
+ }
+
+-Net readNetFromONNX(const std::vector<uchar>&) {
++Net readNetFromONNX(const std::vector<uchar>&, int) {
+ DNN_PROTOBUF_UNSUPPORTED();
+ }
+
diff --git a/opencv/patches/patch-modules_dnn_src_protobuf__io.cpp b/opencv/patches/patch-modules_dnn_src_protobuf__io.cpp
new file mode 100644
index 0000000000..70c06aef31
--- /dev/null
+++ b/opencv/patches/patch-modules_dnn_src_protobuf__io.cpp
@@ -0,0 +1,178 @@
+$NetBSD$
+
+https://github.com/fkenmar/opencv/commit/142801f769ed4946a161f62738bac5a5fe56a60f
+
+--- modules/dnn/src/protobuf_io.cpp.orig 2026-07-06 16:58:50.517939017 +0000
++++ modules/dnn/src/protobuf_io.cpp 2026-07-06 16:58:50.518007886 +0000
+@@ -0,0 +1,171 @@
++/*M///////////////////////////////////////////////////////////////////////////////////////
++//
++// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
++//
++// By downloading, copying, installing or using the software you agree to this license.
++// If you do not agree to this license, do not download, install,
++// copy or use the software.
++//
++//
++// License Agreement
++// For Open Source Computer Vision Library
++//
++// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
++// Third party copyrights are property of their respective owners.
++//
++// Redistribution and use in source and binary forms, with or without modification,
++// are permitted provided that the following conditions are met:
++//
++// * Redistribution's of source code must retain the above copyright notice,
++// this list of conditions and the following disclaimer.
++//
++// * Redistribution's in binary form must reproduce the above copyright notice,
++// this list of conditions and the following disclaimer in the documentation
++// and/or other materials provided with the distribution.
++//
++// * The name of the copyright holders may not be used to endorse or promote products
++// derived from this software without specific prior written permission.
++//
++// This software is provided by the copyright holders and contributors "as is" and
++// any express or implied warranties, including, but not limited to, the implied
++// warranties of merchantability and fitness for a particular purpose are disclaimed.
++// In no event shall the Intel Corporation or contributors be liable for any direct,
++// indirect, incidental, special, exemplary, or consequential damages
++// (including, but not limited to, procurement of substitute goods or services;
++// loss of use, data, or profits; or business interruption) however caused
++// and on any theory of liability, whether in contract, strict liability,
++// or tort (including negligence or otherwise) arising in any way out of
++// the use of this software, even if advised of the possibility of such damage.
++//
++//M*/
++
++/*M///////////////////////////////////////////////////////////////////////////////////////
++//COPYRIGHT
++//
++//All contributions by the University of California:
++//Copyright (c) 2014, The Regents of the University of California (Regents)
++//All rights reserved.
++//
++//All other contributions:
++//Copyright (c) 2014, the respective contributors
++//All rights reserved.
++//
++//Caffe uses a shared copyright model: each contributor holds copyright over
++//their contributions to Caffe. The project versioning records all such
++//contribution and copyright details. If a contributor wants to further mark
++//their specific copyright on a particular contribution, they should indicate
++//their copyright solely in the commit message of the change when it is
++//committed.
++//
++//LICENSE
++//
++//Redistribution and use in source and binary forms, with or without
++//modification, are permitted provided that the following conditions are met:
++//
++//1. Redistributions of source code must retain the above copyright notice, this
++// list of conditions and the following disclaimer.
++//2. Redistributions in binary form must reproduce the above copyright notice,
++// this list of conditions and the following disclaimer in the documentation
++// and/or other materials provided with the distribution.
++//
++//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
++//ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
++//WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++//DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
++//ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
++//(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
++//ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++//(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++//
++//CONTRIBUTION AGREEMENT
++//
++//By contributing to the BVLC/caffe repository through pull-request, comment,
++//or otherwise, the contributor releases their content to the
++//license and copyright terms herein.
++//
++//M*/
++
++#include "precomp.hpp"
++
++#ifdef HAVE_PROTOBUF
++#include <google/protobuf/io/coded_stream.h>
++#include <google/protobuf/io/zero_copy_stream_impl.h>
++#include <google/protobuf/text_format.h>
++
++#include <opencv2/core.hpp>
++
++#include <climits>
++#include <fstream>
++
++#include "protobuf_io.hpp"
++#include "glog_emulator.hpp"
++
++namespace cv {
++namespace dnn {
++
++using namespace ::google::protobuf;
++using namespace ::google::protobuf::io;
++
++static const int kProtoReadBytesLimit = INT_MAX; // Max size of 2 GB minus 1 byte.
++
++static bool ReadProtoFromBinary(ZeroCopyInputStream* input, MessageLite *proto) {
++ CodedInputStream coded_input(input);
++#if defined(GOOGLE_PROTOBUF_VERSION) && GOOGLE_PROTOBUF_VERSION < 3006000
++ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912);
++#else
++ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit);
++#endif
++
++ return proto->ParseFromCodedStream(&coded_input);
++}
++
++bool ReadProtoFromTextFile(const char* filename, Message* proto) {
++ std::ifstream fs(filename, std::ifstream::in);
++ CHECK(fs.is_open()) << "Can't open \"" << filename << "\"";
++ IstreamInputStream input(&fs);
++ google::protobuf::TextFormat::Parser parser;
++#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
++ parser.AllowUnknownField(true);
++ parser.SetRecursionLimit(1000);
++#endif
++ return parser.Parse(&input, proto);
++}
++
++bool ReadProtoFromTextFile(const char* filename, MessageLite* proto) {
++ CV_Error(Error::StsError, "DNN/Protobuf: do not have your message be a MessageLite");
++ return false;
++}
++
++bool ReadProtoFromBinaryFile(const char* filename, MessageLite* proto) {
++ std::ifstream fs(filename, std::ifstream::in | std::ifstream::binary);
++ CHECK(fs.is_open()) << "Can't open \"" << filename << "\"";
++ IstreamInputStream raw_input(&fs);
++
++ return ReadProtoFromBinary(&raw_input, proto);
++}
++
++bool ReadProtoFromTextBuffer(const char* data, size_t len, Message* proto) {
++ ArrayInputStream input(data, len);
++ google::protobuf::TextFormat::Parser parser;
++#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
++ parser.AllowUnknownField(true);
++ parser.SetRecursionLimit(1000);
++#endif
++ return parser.Parse(&input, proto);
++}
++
++bool ReadProtoFromTextBuffer(const char* data, size_t len, MessageLite* proto) {
++ CV_Error(Error::StsError, "DNN/Protobuf: do not have your message be a MessageLite");
++ return false;
++}
++
++bool ReadProtoFromBinaryBuffer(const char* data, size_t len, MessageLite* proto) {
++ ArrayInputStream raw_input(data, len);
++ return ReadProtoFromBinary(&raw_input, proto);
++}
++
++}
++}
++#endif
diff --git a/opencv/patches/patch-modules_dnn_src_protobuf__io.hpp b/opencv/patches/patch-modules_dnn_src_protobuf__io.hpp
new file mode 100644
index 0000000000..f85399ea5e
--- /dev/null
+++ b/opencv/patches/patch-modules_dnn_src_protobuf__io.hpp
@@ -0,0 +1,49 @@
+$NetBSD$
+
+https://github.com/fkenmar/opencv/commit/142801f769ed4946a161f62738bac5a5fe56a60f
+
+--- modules/dnn/src/protobuf_io.hpp.orig 2026-06-05 18:50:05.000000000 +0000
++++ modules/dnn/src/protobuf_io.hpp
+@@ -87,37 +87,18 @@
+ //
+ //M*/
+
+-#ifndef __OPENCV_DNN_CAFFE_IO_HPP__
+-#define __OPENCV_DNN_CAFFE_IO_HPP__
++#ifndef __OPENCV_DNN_PROTOBUF_IO_HPP__
++#define __OPENCV_DNN_PROTOBUF_IO_HPP__
+ #ifdef HAVE_PROTOBUF
+
+-#if defined(__GNUC__) && __GNUC__ >= 5
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wsuggest-override"
+-#endif
+-#include "opencv-caffe.pb.h"
+-#if defined(__GNUC__) && __GNUC__ >= 5
+-#pragma GCC diagnostic pop
+-#endif
++#include <cstddef>
+
+-namespace caffe { using namespace opencv_caffe; } // avoid massive renames from caffe proto package
++namespace google { namespace protobuf { class Message; class MessageLite; } }
+
+ namespace cv {
+ namespace dnn {
+
+-// Read parameters from a file into a NetParameter proto message.
+-void ReadNetParamsFromTextFileOrDie(const char* param_file,
+- caffe::NetParameter* param);
+-void ReadNetParamsFromBinaryFileOrDie(const char* param_file,
+- caffe::NetParameter* param);
+-
+-// Read parameters from a memory buffer into a NetParammeter proto message.
+-void ReadNetParamsFromBinaryBufferOrDie(const char* data, size_t len,
+- caffe::NetParameter* param);
+-void ReadNetParamsFromTextBufferOrDie(const char* data, size_t len,
+- caffe::NetParameter* param);
+-
+-// Utility functions used internally by Caffe and TensorFlow loaders
++// Utility functions used internally by model loaders
+ bool ReadProtoFromTextFile(const char* filename, ::google::protobuf::Message* proto);
+ bool ReadProtoFromTextFile(const char* filename, ::google::protobuf::MessageLite* proto);
+ bool ReadProtoFromBinaryFile(const char* filename, ::google::protobuf::MessageLite* proto);
diff --git a/opencv/patches/patch-modules_dnn_src_tensorflow_tf__importer.cpp b/opencv/patches/patch-modules_dnn_src_tensorflow_tf__importer.cpp
new file mode 100644
index 0000000000..5c761cd33b
--- /dev/null
+++ b/opencv/patches/patch-modules_dnn_src_tensorflow_tf__importer.cpp
@@ -0,0 +1,25 @@
+$NetBSD$
+
+https://github.com/fkenmar/opencv/commit/142801f769ed4946a161f62738bac5a5fe56a60f
+
+--- modules/dnn/src/tensorflow/tf_importer.cpp.orig 2026-06-05 18:50:05.000000000 +0000
++++ modules/dnn/src/tensorflow/tf_importer.cpp
+@@ -3373,15 +3373,15 @@ void writeTextGraph(const String& _model, const String
+
+ #define DNN_PROTOBUF_UNSUPPORTED() CV_Error(Error::StsError, "DNN/TF: Build OpenCV with Protobuf to import TensorFlow models")
+
+-Net readNetFromTensorflow(const String &, const String &) {
++Net readNetFromTensorflow(const String &, const String &, int, const std::vector<String>&) {
+ DNN_PROTOBUF_UNSUPPORTED();
+ }
+
+-Net readNetFromTensorflow(const char*, size_t, const char*, size_t) {
++Net readNetFromTensorflow(const char*, size_t, const char*, size_t, int, const std::vector<String>&) {
+ DNN_PROTOBUF_UNSUPPORTED();
+ }
+
+-Net readNetFromTensorflow(const std::vector<uchar>&, const std::vector<uchar>&) {
++Net readNetFromTensorflow(const std::vector<uchar>&, const std::vector<uchar>&, int, const std::vector<String>&) {
+ DNN_PROTOBUF_UNSUPPORTED();
+ }
+
diff --git a/opencv/patches/patch-modules_dnn_src_tensorflow_tf__io.cpp b/opencv/patches/patch-modules_dnn_src_tensorflow_tf__io.cpp
new file mode 100644
index 0000000000..2802d7780e
--- /dev/null
+++ b/opencv/patches/patch-modules_dnn_src_tensorflow_tf__io.cpp
@@ -0,0 +1,17 @@
+$NetBSD$
+
+https://github.com/fkenmar/opencv/commit/142801f769ed4946a161f62738bac5a5fe56a60f
+
+--- modules/dnn/src/tensorflow/tf_io.cpp.orig 2026-06-05 18:50:05.000000000 +0000
++++ modules/dnn/src/tensorflow/tf_io.cpp
+@@ -25,8 +25,8 @@ Implementation of various functions which are related
+
+ #include "tf_io.hpp"
+
+-#include "../caffe/caffe_io.hpp"
+-#include "../caffe/glog_emulator.hpp"
++#include "../protobuf_io.hpp"
++#include "../glog_emulator.hpp"
+
+ namespace cv {
+ namespace dnn {
diff --git a/opencv/unapplied-patch b/opencv/unapplied-patch
deleted file mode 100644
index d8e2e0e725..0000000000
--- a/opencv/unapplied-patch
+++ /dev/null
@@ -1,55 +0,0 @@
-@@ -1690,34 +1712,54 @@ static inline int capPropertyToV4L2(int
- return -1;
- case cv::CAP_PROP_WHITE_BALANCE_RED_V:
- return V4L2_CID_RED_BALANCE;
-+#ifdef V4L2_CID_ZOOM_ABSOLUTE
- case cv::CAP_PROP_ZOOM:
- return V4L2_CID_ZOOM_ABSOLUTE;
-+#endif
-+#ifdef V4L2_CID_FOCUS_ABSOLUTE
- case cv::CAP_PROP_FOCUS:
- return V4L2_CID_FOCUS_ABSOLUTE;
-+#endif
- case cv::CAP_PROP_GUID:
- return -1;
-+#ifdef V4L2_CID_ISO_SENSITIVITY
- case cv::CAP_PROP_ISO_SPEED:
- return V4L2_CID_ISO_SENSITIVITY;
-+#endif
- case cv::CAP_PROP_BACKLIGHT:
- return V4L2_CID_BACKLIGHT_COMPENSATION;
-+#ifdef V4L2_CID_PAN_ABSOLUTE
- case cv::CAP_PROP_PAN:
- return V4L2_CID_PAN_ABSOLUTE;
-+#endif
-+#ifdef V4L2_CID_TILT_ABSOLUTE
- case cv::CAP_PROP_TILT:
- return V4L2_CID_TILT_ABSOLUTE;
-+#endif
-+#ifdef V4L2_CID_ROTATE
- case cv::CAP_PROP_ROLL:
- return V4L2_CID_ROTATE;
-+#endif
-+#ifdef V4L2_CID_IRIS_ABSOLUTE
- case cv::CAP_PROP_IRIS:
- return V4L2_CID_IRIS_ABSOLUTE;
-+#endif
- case cv::CAP_PROP_SETTINGS:
- return -1;
- case cv::CAP_PROP_BUFFERSIZE:
- return -1;
-+#ifdef V4L2_CID_FOCUS_AUTO
- case cv::CAP_PROP_AUTOFOCUS:
- return V4L2_CID_FOCUS_AUTO;
-+#endif
-+#ifdef V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT
- case cv::CAP_PROP_SAR_NUM:
- return V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT;
-+#endif
-+#ifdef V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH
- case cv::CAP_PROP_SAR_DEN:
- return V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH;
-+#endif
- case CAP_PROP_AUTO_WB:
- return V4L2_CID_AUTO_WHITE_BALANCE;
- case CAP_PROP_WB_TEMPERATURE:
Home |
Main Index |
Thread Index |
Old Index