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/arcus | |
| 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/arcus')
| -rw-r--r-- | ports/arcus/0001-fix-protobuf-deprecated.patch | 13 | ||||
| -rw-r--r-- | ports/arcus/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/arcus/vcpkg.json | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/ports/arcus/0001-fix-protobuf-deprecated.patch b/ports/arcus/0001-fix-protobuf-deprecated.patch new file mode 100644 index 000000000..a40da846d --- /dev/null +++ b/ports/arcus/0001-fix-protobuf-deprecated.patch @@ -0,0 +1,13 @@ +diff --git a/src/Socket_p.h b/src/Socket_p.h +index 9c3c084..9ccabda 100644 +--- a/src/Socket_p.h ++++ b/src/Socket_p.h +@@ -548,7 +548,7 @@ namespace Arcus + + google::protobuf::io::ArrayInputStream array(wire_message->data, wire_message->size); + google::protobuf::io::CodedInputStream stream(&array); +- stream.SetTotalBytesLimit(message_size_maximum, message_size_warning); ++ stream.SetTotalBytesLimit(message_size_maximum); + if(!message->ParseFromCodedStream(&stream)) + { + error(ErrorCode::ParseFailedError, "Failed to parse message:" + std::string(wire_message->data)); diff --git a/ports/arcus/portfile.cmake b/ports/arcus/portfile.cmake index d22a64d30..d2777742b 100644 --- a/ports/arcus/portfile.cmake +++ b/ports/arcus/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 617f6f71572090f73cb44592b12f49567b539e5b #v4.10.0
SHA512 cf0954d8b10d9f94165aa5c086d0e58c2925464f9fbe4252535c36d7e6bb12b767d89efb816c9e642f9cd7f0ec0d66d61ca21c5121a05340499d38d5d851f73b
HEAD_REF master
+ PATCHES
+ 0001-fix-protobuf-deprecated.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC)
diff --git a/ports/arcus/vcpkg.json b/ports/arcus/vcpkg.json index bb3d46b35..bf7b6b4db 100644 --- a/ports/arcus/vcpkg.json +++ b/ports/arcus/vcpkg.json @@ -1,6 +1,7 @@ { "name": "arcus", "version-semver": "4.10.0", + "port-version": 1, "description": "This library contains C++ bindings for creating a socket in a thread and using this socket to send and receive messages based on the Protocol Buffers library.", "homepage": "https://github.com/Ultimaker/libArcus", "supports": "!uwp", |