diff options
| author | Carlos O'Ryan <coryan@users.noreply.github.com> | 2021-09-22 13:09:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 13:09:55 -0700 |
| commit | b29f8ef37edb1cedd5c2e403dbcb355443b939f6 (patch) | |
| tree | 4ccc9c0b3655d54b05c41e88f3e129125eac1800 /ports/opencv4 | |
| parent | 93885afd50ff1a1408e1785dceffb01ff648c7d9 (diff) | |
| download | vcpkg-b29f8ef37edb1cedd5c2e403dbcb355443b939f6.tar.gz vcpkg-b29f8ef37edb1cedd5c2e403dbcb355443b939f6.zip | |
[protobuf] upgrade to latest release (v3.18.0) (#20208)
* [protobuf] upgrade to latest release (v3.18.0)
This requires patching OpenCV as it uses a function removed in the
latest version of protobuf (FWIW, upstream OpenCV has a similar patch).
* The arcus port also needs a patch
* The caffe2 port also needs a patch
* The brpc port also needs a patch
Diffstat (limited to 'ports/opencv4')
| -rw-r--r-- | ports/opencv4/0011-fix-caffe-io.patch | 13 | ||||
| -rw-r--r-- | ports/opencv4/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/opencv4/vcpkg.json | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ports/opencv4/0011-fix-caffe-io.patch b/ports/opencv4/0011-fix-caffe-io.patch new file mode 100644 index 000000000..ee33ea63f --- /dev/null +++ b/ports/opencv4/0011-fix-caffe-io.patch @@ -0,0 +1,13 @@ +diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp +index 2fc4d84..779d0dd 100644 +--- a/modules/dnn/src/caffe/caffe_io.cpp ++++ b/modules/dnn/src/caffe/caffe_io.cpp +@@ -1111,7 +1111,7 @@ static const int kProtoReadBytesLimit = INT_MAX; // Max size of 2 GB minus 1 by + + bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) { + CodedInputStream coded_input(input); +- coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912); ++ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit); + + return proto->ParseFromCodedStream(&coded_input); + } diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index e965dd2a0..760cfbea7 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -24,6 +24,7 @@ vcpkg_from_github( 0008-devendor-quirc.patch 0009-fix-protobuf.patch 0010-fix-uwp-tiff-imgcodecs.patch + 0011-fix-caffe-io.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index dce331bf1..54ae37008 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.5.3", - "port-version": 1, + "port-version": 2, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ |