diff --git a/package/opencv4/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch b/package/opencv4/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch deleted file mode 100644 index d169e04ef2..0000000000 --- a/package/opencv4/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9cfa84313c5833d7295fcf57be93d5d2aaadfd88 Mon Sep 17 00:00:00 2001 -From: Vincent Rabaud -Date: Sat, 10 Jul 2021 00:21:52 +0200 -Subject: [PATCH] Use the one argument version of SetTotalBytesLimit. - -The two argument versions has been deprecated, cf -https://developers.google.com/protocol-buffers/docs/reference/cpp/google.protobuf.io.coded_stream - -[Retrieved from: -https://github.com/opencv/opencv/commit/9cfa84313c5833d7295fcf57be93d5d2aaadfd88] -Signed-off-by: Fabrice Fontaine ---- - modules/dnn/src/caffe/caffe_io.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp -index 2fc4d84f4604..ebecf95eea3a 100644 ---- a/modules/dnn/src/caffe/caffe_io.cpp -+++ b/modules/dnn/src/caffe/caffe_io.cpp -@@ -92,6 +92,7 @@ - #ifdef HAVE_PROTOBUF - #include - #include -+#include - #include - - #include -@@ -1111,7 +1112,11 @@ static const int kProtoReadBytesLimit = INT_MAX; // Max size of 2 GB minus 1 by - - bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) { - CodedInputStream coded_input(input); -+#if GOOGLE_PROTOBUF_VERSION >= 3006000 -+ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit); -+#else - coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912); -+#endif - - return proto->ParseFromCodedStream(&coded_input); - } diff --git a/package/opencv4/opencv4.hash b/package/opencv4/opencv4.hash index b8e38d333a..791ebe3d35 100644 --- a/package/opencv4/opencv4.hash +++ b/package/opencv4/opencv4.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 77f616ae4bea416674d8c373984b20c8bd55e7db887fd38c6df73463a0647bab opencv4-4.5.3.tar.gz +sha256 c20bb83dd790fc69df9f105477e24267706715a9d3c705ca1e7f613c7b3bad3d opencv4-4.5.4.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencv4/opencv4.mk b/package/opencv4/opencv4.mk index 040fc63e4e..1859b866dd 100644 --- a/package/opencv4/opencv4.mk +++ b/package/opencv4/opencv4.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV4_VERSION = 4.5.3 +OPENCV4_VERSION = 4.5.4 OPENCV4_SITE = $(call github,opencv,opencv,$(OPENCV4_VERSION)) OPENCV4_INSTALL_STAGING = YES OPENCV4_LICENSE = Apache-2.0