pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
opencv: update to 5.1.0.
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Fri Nov 6 15:05:15 2026 +0100
Changeset: 298625f518bcaaa4ce7b31094effd1f20c3f28be
Modified Files:
opencv/Makefile
opencv/Makefile.common
opencv/PLIST
opencv/distinfo
opencv/patches/patch-modules_videoio_src_cap__v4l.cpp
Removed 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
Log Message:
opencv: update to 5.1.0.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=298625f518bcaaa4ce7b31094effd1f20c3f28be
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
opencv/Makefile | 8 -
opencv/Makefile.common | 2 +-
opencv/PLIST | 42 +++--
opencv/distinfo | 18 +--
.../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 --
.../patches/patch-modules_videoio_src_cap__v4l.cpp | 18 +--
15 files changed, 40 insertions(+), 492 deletions(-)
diffs:
diff --git a/opencv/Makefile b/opencv/Makefile
index 8b42b547f8..4c353e38f4 100644
--- a/opencv/Makefile
+++ b/opencv/Makefile
@@ -28,14 +28,6 @@ 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/opencv5 ${DESTDIR}${PREFIX}/share/opencv5/licenses
diff --git a/opencv/Makefile.common b/opencv/Makefile.common
index e223fc20a6..bbeb286d3a 100644
--- a/opencv/Makefile.common
+++ b/opencv/Makefile.common
@@ -3,7 +3,7 @@
# used by graphics/opencv/Makefile
# used by graphics/opencv-contrib-face/Makefile
-OPENCV_VERSION= 5.0.0
+OPENCV_VERSION= 5.1.0
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=opencv/}
diff --git a/opencv/PLIST b/opencv/PLIST
index 460b7a7595..cd0096b28d 100644
--- a/opencv/PLIST
+++ b/opencv/PLIST
@@ -1,4 +1,6 @@
@comment $NetBSD$
+bin/opencv_camera_enumerate
+bin/opencv_interactive-calibration
bin/opencv_model_diagnostics
bin/opencv_version
include/opencv5/opencv2/calib.hpp
@@ -233,6 +235,12 @@ 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/slam.hpp
+include/opencv5/opencv2/ptcloud/slam/map.hpp
+include/opencv5/opencv2/ptcloud/slam/odometry_params.hpp
+include/opencv5/opencv2/ptcloud/slam/types.hpp
+include/opencv5/opencv2/ptcloud/slam/visual_odometry.hpp
+include/opencv5/opencv2/ptcloud/viz3d.hpp
include/opencv5/opencv2/ptcloud/volume.hpp
include/opencv5/opencv2/ptcloud/volume_settings.hpp
include/opencv5/opencv2/stereo.hpp
@@ -265,52 +273,52 @@ 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_calib.so.501
lib/libopencv_core.so
lib/libopencv_core.so.${PKGVERSION}
-lib/libopencv_core.so.500
+lib/libopencv_core.so.501
lib/libopencv_dnn.so
lib/libopencv_dnn.so.${PKGVERSION}
-lib/libopencv_dnn.so.500
+lib/libopencv_dnn.so.501
lib/libopencv_features.so
lib/libopencv_features.so.${PKGVERSION}
-lib/libopencv_features.so.500
+lib/libopencv_features.so.501
lib/libopencv_flann.so
lib/libopencv_flann.so.${PKGVERSION}
-lib/libopencv_flann.so.500
+lib/libopencv_flann.so.501
lib/libopencv_geometry.so
lib/libopencv_geometry.so.${PKGVERSION}
-lib/libopencv_geometry.so.500
+lib/libopencv_geometry.so.501
lib/libopencv_highgui.so
lib/libopencv_highgui.so.${PKGVERSION}
-lib/libopencv_highgui.so.500
+lib/libopencv_highgui.so.501
lib/libopencv_imgcodecs.so
lib/libopencv_imgcodecs.so.${PKGVERSION}
-lib/libopencv_imgcodecs.so.500
+lib/libopencv_imgcodecs.so.501
lib/libopencv_imgproc.so
lib/libopencv_imgproc.so.${PKGVERSION}
-lib/libopencv_imgproc.so.500
+lib/libopencv_imgproc.so.501
lib/libopencv_objdetect.so
lib/libopencv_objdetect.so.${PKGVERSION}
-lib/libopencv_objdetect.so.500
+lib/libopencv_objdetect.so.501
lib/libopencv_photo.so
lib/libopencv_photo.so.${PKGVERSION}
-lib/libopencv_photo.so.500
+lib/libopencv_photo.so.501
lib/libopencv_ptcloud.so
lib/libopencv_ptcloud.so.${PKGVERSION}
-lib/libopencv_ptcloud.so.500
+lib/libopencv_ptcloud.so.501
lib/libopencv_stereo.so
lib/libopencv_stereo.so.${PKGVERSION}
-lib/libopencv_stereo.so.500
+lib/libopencv_stereo.so.501
lib/libopencv_stitching.so
lib/libopencv_stitching.so.${PKGVERSION}
-lib/libopencv_stitching.so.500
+lib/libopencv_stitching.so.501
lib/libopencv_video.so
lib/libopencv_video.so.${PKGVERSION}
-lib/libopencv_video.so.500
+lib/libopencv_video.so.501
lib/libopencv_videoio.so
lib/libopencv_videoio.so.${PKGVERSION}
-lib/libopencv_videoio.so.500
+lib/libopencv_videoio.so.501
${PYSITELIB}/cv2/Error/__init__.pyi
${PYSITELIB}/cv2/__init__.py
${PYSITELIB}/cv2/__init__.pyi
@@ -339,6 +347,7 @@ ${PYSITELIB}/cv2/py.typed
${PYSITELIB}/cv2/python-${PYVERSSUFFIX}/cv2.so
${PYSITELIB}/cv2/samples/__init__.pyi
${PYSITELIB}/cv2/segmentation/__init__.pyi
+${PYSITELIB}/cv2/slam/__init__.pyi
${PYSITELIB}/cv2/typing/__init__.py
${PYSITELIB}/cv2/utils/__init__.py
${PYSITELIB}/cv2/utils/__init__.pyi
@@ -346,6 +355,7 @@ ${PYSITELIB}/cv2/utils/fs/__init__.pyi
${PYSITELIB}/cv2/utils/logging/__init__.pyi
${PYSITELIB}/cv2/utils/nested/__init__.pyi
${PYSITELIB}/cv2/videoio_registry/__init__.pyi
+${PYSITELIB}/cv2/viz3d/__init__.pyi
share/opencv5/licenses/SoftFloat-COPYING.txt
share/opencv5/licenses/annoylib-LICENSE
share/opencv5/licenses/clapack-lapack_LICENSE
diff --git a/opencv/distinfo b/opencv/distinfo
index 5844a5aad7..a87b1fe5b4 100644
--- a/opencv/distinfo
+++ b/opencv/distinfo
@@ -1,21 +1,11 @@
$NetBSD: distinfo,v 1.66 2026/01/05 02:53:35 wiz Exp $
-BLAKE2s (opencv-5.0.0.tar.gz) = 42d24b05b62365d961781149deaa7726357ba39cdea6e87c0cb93ff7b8168c13
-SHA512 (opencv-5.0.0.tar.gz) = 37143de2ba76a9af351d6901358635b42b671b5fbe3ccc75d4d27133b0a6c6a0400564e6eaf228fc1705e25a2af09c8e2638039ca9af0ce9428da253dd31d3e0
-Size (opencv-5.0.0.tar.gz) = 81594270 bytes
+BLAKE2s (opencv-5.1.0.tar.gz) = bd9b62c96379df5a012d4078ad159e5122840d59c6c7dd6625d7e24c0827d6cf
+SHA512 (opencv-5.1.0.tar.gz) = e90c75b1ce8332639c853e14a59059ec9b89ffa1d5435ab59820f4fa2e12d30846592672af808817d542a91248b164f6d54eeb6331be52e48062113f24d4c835
+Size (opencv-5.1.0.tar.gz) = 83196865 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
+SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 9cfd97c1eb8acff674223bba7f96824d25b15125
diff --git a/opencv/patches/patch-modules_core_src_hal__internal.cpp b/opencv/patches/patch-modules_core_src_hal__internal.cpp
deleted file mode 100644
index f533ac206c..0000000000
--- a/opencv/patches/patch-modules_core_src_hal__internal.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index dcabead16c..0000000000
--- a/opencv/patches/patch-modules_dnn_CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-$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
deleted file mode 100644
index 9abe75da83..0000000000
--- a/opencv/patches/patch-modules_dnn_src_glog__emulator.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$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
deleted file mode 100644
index 17476aaf66..0000000000
--- a/opencv/patches/patch-modules_dnn_src_layers_cast2__layer.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-$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
deleted file mode 100644
index 77b441e7f5..0000000000
--- a/opencv/patches/patch-modules_dnn_src_ocl4dnn_include_common.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 9b93545bcb..0000000000
--- a/opencv/patches/patch-modules_dnn_src_onnx_onnx__importer.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$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
deleted file mode 100644
index 70c06aef31..0000000000
--- a/opencv/patches/patch-modules_dnn_src_protobuf__io.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-$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
deleted file mode 100644
index f85399ea5e..0000000000
--- a/opencv/patches/patch-modules_dnn_src_protobuf__io.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-$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
deleted file mode 100644
index 5c761cd33b..0000000000
--- a/opencv/patches/patch-modules_dnn_src_tensorflow_tf__importer.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$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
deleted file mode 100644
index 2802d7780e..0000000000
--- a/opencv/patches/patch-modules_dnn_src_tensorflow_tf__io.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$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/patches/patch-modules_videoio_src_cap__v4l.cpp b/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp
index 2dcc83011b..21b344f8a2 100644
--- a/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp
+++ b/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp
@@ -3,11 +3,11 @@ $NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.11 2025/07/07 05:15:26 wiz E
Conditionalize settings not available in NetBSD's v4l2 emulation.
Avoid non-standard integer types.
---- modules/videoio/src/cap_v4l.cpp.orig 2026-06-05 18:50:05.000000000 +0000
+--- modules/videoio/src/cap_v4l.cpp.orig 2026-11-05 11:18:05.000000000 +0000
+++ modules/videoio/src/cap_v4l.cpp
-@@ -215,6 +215,14 @@ make & enjoy!
- #include <fcntl.h>
+@@ -216,6 +216,14 @@ make & enjoy!
#include <errno.h>
+ #include <dirent.h>
#include <sys/ioctl.h>
+#include <inttypes.h>
+#include <stdint.h>
@@ -20,7 +20,7 @@ Avoid non-standard integer types.
#include <sys/types.h>
#include <sys/mman.h>
-@@ -241,24 +249,30 @@ typedef uint32_t __u32;
+@@ -242,24 +250,30 @@ typedef uint32_t __u32;
#endif
// https://github.com/opencv/opencv/issues/13335
@@ -51,7 +51,7 @@ Avoid non-standard integer types.
#ifndef v4l2_fourcc_be
#define v4l2_fourcc_be(a, b, c, d) (v4l2_fourcc(a, b, c, d) | (1U << 31))
-@@ -1467,6 +1481,7 @@ void CvCaptureCAM_V4L::convertToRgb(const Buffer &curr
+@@ -1468,6 +1482,7 @@ void CvCaptureCAM_V4L::convertToRgb(const Buffer &curr
case V4L2_PIX_FMT_RGB24:
cv::cvtColor(cv::Mat(imageSize, CV_8UC3, start), frame, COLOR_RGB2BGR);
return;
@@ -59,7 +59,7 @@ Avoid non-standard integer types.
case V4L2_PIX_FMT_Y16:
{
// https://www.kernel.org/doc/html/v4.10/media/uapi/v4l/pixfmt-y16.html
-@@ -1531,6 +1546,7 @@ void CvCaptureCAM_V4L::convertToRgb(const Buffer &curr
+@@ -1532,6 +1547,7 @@ void CvCaptureCAM_V4L::convertToRgb(const Buffer &curr
cv::cvtColor(cv::Mat(imageSize, CV_8UC1, start), frame, COLOR_BayerGB2BGR);
return;
}
@@ -67,7 +67,7 @@ Avoid non-standard integer types.
case V4L2_PIX_FMT_GREY:
cv::cvtColor(cv::Mat(imageSize, CV_8UC1, start), frame, COLOR_GRAY2BGR);
return;
-@@ -1650,8 +1666,10 @@ static inline int capPropertyToV4L2(int prop)
+@@ -1651,8 +1667,10 @@ static inline int capPropertyToV4L2(int prop)
return CAP_PROP_UNKNOWN;
case cv::CAP_PROP_FOURCC:
return CAP_PROP_UNKNOWN;
@@ -78,7 +78,7 @@ Avoid non-standard integer types.
case cv::CAP_PROP_FORMAT:
return CAP_PROP_UNKNOWN;
case cv::CAP_PROP_MODE:
-@@ -1666,8 +1684,10 @@ static inline int capPropertyToV4L2(int prop)
+@@ -1667,8 +1685,10 @@ static inline int capPropertyToV4L2(int prop)
return V4L2_CID_HUE;
case cv::CAP_PROP_GAIN:
return V4L2_CID_GAIN;
@@ -89,7 +89,7 @@ Avoid non-standard integer types.
case cv::CAP_PROP_CONVERT_RGB:
return CAP_PROP_UNKNOWN;
case cv::CAP_PROP_WHITE_BALANCE_BLUE_U:
-@@ -1678,8 +1698,10 @@ static inline int capPropertyToV4L2(int prop)
+@@ -1679,8 +1699,10 @@ static inline int capPropertyToV4L2(int prop)
return CAP_PROP_UNKNOWN;
case cv::CAP_PROP_SHARPNESS:
return V4L2_CID_SHARPNESS;
Home |
Main Index |
Thread Index |
Old Index