Skip to content

3rdparty(protobuf): upgrade 3.5.2 => 3.19.1#20998

Merged
alalek merged 5 commits intoopencv:4.xfrom
alalek:update_protobuf_3.19.1
Nov 10, 2021
Merged

3rdparty(protobuf): upgrade 3.5.2 => 3.19.1#20998
alalek merged 5 commits intoopencv:4.xfrom
alalek:update_protobuf_3.19.1

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Nov 3, 2021 •
edited
Loading

New protobuf requires C++11 so this patch is targeted for OpenCV 4.x+ only.

Excluded files:

Details 
#       deleted:    3rdparty/protobuf/src/google/protobuf/any.pb.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/any.pb.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/api.pb.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/api.pb.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/duration.pb.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/duration.pb.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/empty.pb.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/empty.pb.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/field_mask.pb.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/generated_enum_util.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/generated_message_bases.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/generated_message_table_driven.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/generated_message_table_driven_lite.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/generated_message_table_driven_lite.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/generated_message_tctable_full.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/generated_message_tctable_lite.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/inlined_string_field.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/io/gzip_stream.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/io/gzip_stream.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/io/printer.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/io/printer.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/package_info.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/service.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/service.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/source_context.pb.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/source_context.pb.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/string_member_robber.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/struct.pb.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/struct.pb.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/stubs/mathutil.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/stubs/status_macros.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/stubs/statusor.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/stubs/statusor.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/stubs/template_util.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/stubs/time.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/stubs/time.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/timestamp.pb.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/timestamp.pb.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/type.pb.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/type.pb.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/delimited_message_util.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/delimited_message_util.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/field_comparator.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/field_comparator.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/field_mask_util.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/field_mask_util.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/constants.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/datapiece.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/datapiece.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/error_listener.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/error_listener.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/expecting_objectwriter.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/field_mask_utility.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/field_mask_utility.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/json_escaping.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/json_escaping.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/json_objectwriter.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/json_objectwriter.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/json_stream_parser.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/json_stream_parser.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/location_tracker.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/mock_error_listener.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/object_location_tracker.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/object_source.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/object_writer.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/object_writer.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/proto_writer.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/proto_writer.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/protostream_objectsource.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/type_info.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/type_info.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/utility.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/internal/utility.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/json_util.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/json_util.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/message_differencer.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/message_differencer.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/package_info.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/time_util.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/time_util.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/type_resolver.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/type_resolver_util.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/util/type_resolver_util.h
#       deleted:    3rdparty/protobuf/src/google/protobuf/wrappers.pb.cc
#       deleted:    3rdparty/protobuf/src/google/protobuf/wrappers.pb.h

force_builders=Custom
buildworker:Custom=linux-1
Xbuild_image:Custom=ubuntu-clang:18.04
Xbuild_image:Custom=ubuntu-clang:20.04
build_image:Custom=oneapi-2021.4.0-icc

@alalek alalek merged commit d934bb1 into opencv:4.x Nov 10, 2021
@alalek alalek mentioned this pull request Nov 30, 2021
Merged
@alalek alalek mentioned this pull request Dec 30, 2021
Merged
@alalek alalek mentioned this pull request Feb 22, 2022
Merged
@SpaceIm SpaceIm mentioned this pull request Jan 30, 2023
Merged
3 tasks
a-sajjad72 pushed a commit to a-sajjad72/opencv that referenced this pull request Mar 30, 2023
@alalek
Merge pull request opencv#20998 from alalek:update_protobuf_3.19.1
44235f6 
3rdparty(protobuf): upgrade 3.5.2 => 3.19.1

* 3rdparty(protobuf): upgrade 3.5.2 => 3.19.1

* dnn: update protobuf files (3.19.1)

* 3rdparty(protobuf): re-apply OpenCV patch for custom fields (3.19.1)

* protobuf: suppress new build warnings

* protobuf: remove unused files
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mshabunin mshabunin mshabunin approved these changes

Assignees

@mshabunin mshabunin

Labels

category: dnn category: 3rdparty

Projects

None yet

Milestone

4.5.5

Development

Successfully merging this pull request may close these issues.

2 participants

@alalek @mshabunin