opencv opencv-contrib-face: updated to 3.4.16

OpenCV 3.4.16 has been released. Bug fixes, optimizations and other enhancements are propagated into OpenCV 4.5.4.

5 files changed, 7 insertions, 40 deletions

diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 2bb6ff34ffa..19d5ea6e683 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.100 2021/10/09 15:35:06 nia Exp $
+# $NetBSD: Makefile,v 1.101 2021/10/10 07:02:01 adam Exp $
 
-PKGREVISION= 1
 .include "Makefile.common"
 
 DISTNAME=	opencv-${OPENCV_VERSION}
diff --git a/graphics/opencv/Makefile.common b/graphics/opencv/Makefile.common
index f48cb7a7dcb..37283f57e45 100644
--- a/graphics/opencv/Makefile.common
+++ b/graphics/opencv/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.9 2021/10/09 15:35:06 nia Exp $
+# $NetBSD: Makefile.common,v 1.10 2021/10/10 07:02:01 adam Exp $
 # used by graphics/opencv/Makefile
 # used by graphics/opencv-contrib-face/Makefile
 #
 # DO NOT FORGET to regen graphics/opencv-contrib-face/distinfo!
 
-OPENCV_VERSION=	3.4.15
+OPENCV_VERSION=	3.4.16
 
 CATEGORIES=	graphics devel
 
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
index 50b29ff9959..9642aea1b22 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.53 2021/10/07 14:12:36 nia Exp $
+$NetBSD: distinfo,v 1.54 2021/10/10 07:02:01 adam Exp $
 
-RMD160 (opencv-3.4.15.tar.gz) = e7f75f9f9f6102ab7b88d04be4e00a0148eb623c
-SHA512 (opencv-3.4.15.tar.gz) = 775149e56f0aa94d53eb024404866380d97ce423ef1c8343ee8f12c1377e454ae182b2528e86949b5f7250e551d464bd1a5de2e2d9f0d0e1dd3dc188a1db790d
-Size (opencv-3.4.15.tar.gz) = 87661484 bytes
+RMD160 (opencv-3.4.16.tar.gz) = c8c3c68a05b01d58505ca84e328996bbe17706b2
+SHA512 (opencv-3.4.16.tar.gz) = 2fa9243625309a1c12c916737c94f0e2f9566f0828469b148cc1683dd1b8db8d1d58f90a36cfcaa72052964a718929451f04cda5361d8b546a63da69217d040a
+Size (opencv-3.4.16.tar.gz) = 87694121 bytes
 SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
 SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf
 SHA1 (patch-CMakeLists.txt) = 029368ab14163640d1651f572810eb8eb0c043d9
@@ -17,10 +17,8 @@ SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167
 SHA1 (patch-modules_core_src_check.cpp) = c8dac4e0fb6fa4a0dca6a2794bd598ba114e78b6
 SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
 SHA1 (patch-modules_core_src_hal__internal.cpp) = 22beba5ee93fc468999479227d7ef07397848b22
-SHA1 (patch-modules_core_src_parallel.cpp) = 9974e53f3be96782025dae3c64d9f1535d9bf0fd
 SHA1 (patch-modules_core_src_rand.cpp) = aa87ee5a538deb1a2ed3e89dd3dd4ee9b86ae0de
 SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
-SHA1 (patch-modules_dnn_src_caffe_caffe__io.cpp) = 705963fb3227174c414874a8dd28a9f1219be070
 SHA1 (patch-modules_dnn_src_tensorflow_tf__importer.cpp) = 9b3628d91c2217c4b1ed77413efd4c0bf85758c4
 SHA1 (patch-modules_dnn_src_torch_torch__importer.cpp) = 814a3cc929569b691d01e34252dbd185f31161c2
 SHA1 (patch-modules_dnn_test__precomp.hpp) = 9bf15d32394f36b92e5fc5d57fd576b3860233ae
diff --git a/graphics/opencv/patches/patch-modules_core_src_parallel.cpp b/graphics/opencv/patches/patch-modules_core_src_parallel.cpp
deleted file mode 100644
index cdd115d915f..00000000000
--- a/graphics/opencv/patches/patch-modules_core_src_parallel.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-modules_core_src_parallel.cpp,v 1.1 2021/10/06 21:10:24 adam Exp $
-
-NetBSD support.
-
---- modules/core/src/parallel.cpp.orig	2021-10-06 20:27:21.320272155 +0000
-+++ modules/core/src/parallel.cpp
-@@ -55,7 +55,7 @@
- 
- #if defined __linux__ || defined __APPLE__ || defined __GLIBC__ \
-     || defined __HAIKU__ || defined __EMSCRIPTEN__ || defined __FreeBSD__ \
--    || defined __OpenBSD__
-+    || defined __OpenBSD__ || defined __NetBSD__
-     #include <unistd.h>
-     #include <stdio.h>
-     #include <sys/types.h>
diff --git a/graphics/opencv/patches/patch-modules_dnn_src_caffe_caffe__io.cpp b/graphics/opencv/patches/patch-modules_dnn_src_caffe_caffe__io.cpp
deleted file mode 100644
index 3ec0019a452..00000000000
--- a/graphics/opencv/patches/patch-modules_dnn_src_caffe_caffe__io.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-modules_dnn_src_caffe_caffe__io.cpp,v 1.1 2021/10/06 21:10:24 adam Exp $
-
-Avoid deprecated version of profobuf's SetTotalBytesLimit().
-
---- modules/dnn/src/caffe/caffe_io.cpp.orig	2021-10-06 19:52:42.000000000 +0000
-+++ modules/dnn/src/caffe/caffe_io.cpp
-@@ -1111,7 +1111,7 @@ static const int kProtoReadBytesLimit = 
- 
- bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) {
-     CodedInputStream coded_input(input);
--    coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912);
-+    coded_input.SetTotalBytesLimit(kProtoReadBytesLimit);
- 
-     return proto->ParseFromCodedStream(&coded_input);
- }