[grpc] Update to 1.49.0 (#26836)

* abseil: Update to 20220623.1

* upb: Update to 2022-06-21

* grpc: Update to 1.49.0

* grpc: Adjust SHA512 for v1.49.0

* abseil: Add license field
This commit is contained in:
Dennis 2022-09-26 08:11:57 +02:00 committed by GitHub
parent 57d3194e70
commit 5f6a2ed8cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 46 additions and 27 deletions

View File

@ -5,8 +5,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO abseil/abseil-cpp
REF 215105818dfde3174fe799600bb0f3cae233d0bf #LTS 20211102, Patch 1
SHA512 75d234eac76be8790cf09e3e1144e4b4cf5cacb61e46961a9e4a35b37d0fa85243afdd5de5f47a006ef96af6fc91ecc0c233297c4c32258c08d46304b3361330
REF 8c0b94e793a66495e0b1f34a5eb26bd7dc672db0 # LTS 20220623.1
SHA512 a076c198103dc5cf22ac978fe7754dd34cb2e782d7db1c2c98393c94639e461bfe31b10c0663f750f743bc1c0c245fd4b6115356f136fe14bd036d267caf2a8b
HEAD_REF master
PATCHES
# in C++17 mode, use std::any, std::optional, std::string_view, std::variant

View File

@ -1,6 +1,6 @@
{
"name": "abseil",
"version-string": "20211102.1",
"version-string": "20220623.1",
"description": [
"an open-source collection designed to augment the C++ standard library.",
"Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.",
@ -8,6 +8,7 @@
"Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole."
],
"homepage": "https://github.com/abseil/abseil-cpp",
"license": "Apache-2.0",
"dependencies": [
{
"name": "vcpkg-cmake",

View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25990a5d8a..9a24f7c6cb 100644
index 8498b6e435..12d50a26ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,6 +85,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package")
@ -12,15 +12,15 @@ index 25990a5d8a..9a24f7c6cb 100644
set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package")
set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE")
@@ -1570,6 +1573,7 @@ target_link_libraries(gpr
absl::synchronization
@@ -1596,6 +1599,7 @@ target_link_libraries(gpr
absl::time
absl::optional
absl::variant
+ ${_gRPC_UPB_LIBRARIES}
)
if(_gRPC_PLATFORM_ANDROID)
target_link_libraries(gpr
@@ -2361,7 +2365,6 @@ target_link_libraries(grpc
@@ -2400,7 +2404,6 @@ target_link_libraries(grpc
gpr
${_gRPC_SSL_LIBRARIES}
address_sorting
@ -28,7 +28,7 @@ index 25990a5d8a..9a24f7c6cb 100644
)
if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
target_link_libraries(grpc "-framework CoreFoundation")
@@ -2927,7 +2930,6 @@ target_link_libraries(grpc_unsecure
@@ -2961,7 +2964,6 @@ target_link_libraries(grpc_unsecure
absl::utility
gpr
address_sorting
@ -36,7 +36,7 @@ index 25990a5d8a..9a24f7c6cb 100644
)
if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
target_link_libraries(grpc_unsecure "-framework CoreFoundation")
@@ -4181,6 +4183,7 @@ endif()
@@ -4254,6 +4256,7 @@ endif()
endif()
@ -44,7 +44,7 @@ index 25990a5d8a..9a24f7c6cb 100644
add_library(upb
third_party/upb/third_party/utf8_range/naive.c
third_party/upb/third_party/utf8_range/range2-neon.c
@@ -4242,7 +4245,7 @@ if(gRPC_INSTALL)
@@ -4322,7 +4325,7 @@ if(gRPC_INSTALL)
ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
)
endif()

View File

@ -1,13 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25990a5d8a..4c7831cba5 100644
index 8498b6e435..4e2e9a6130 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20398,7 +20398,7 @@ generate_pkgconfig(
@@ -21946,7 +21946,7 @@ generate_pkgconfig(
"high performance general RPC framework"
"${gRPC_CORE_VERSION}"
"gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant"
"gpr openssl absl_any_invocable absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant"
- "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz"
+ "-lgrpc -laddress_sorting -lre2 -lupb_json -lupb_textformat -lupb_reflection -lupb -lupb_fastdecode -lupb_utf8_range -ldescriptor_upb_proto -lcares -lz"
+ "-lgrpc -laddress_sorting -lre2 -ldescriptor_upb_proto -lupb_collections -lupb_extension_registry -lupb_fastdecode -lupb_json -lupb_reflection -lupb_textformat -lupb_utf8_range -lupb -lcares -lz"
""
"grpc.pc")

View File

@ -5,8 +5,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO grpc/grpc
REF v1.48.0
SHA512 558c659b325eb2f64f6caf78c0701eaaf3d9ae35f6d25ccd69b8995d5b82b98ca1a7ef9f497a0a1dab5914d2328c044c108373152426a15045d0c978b27f3503
REF v1.49.0
SHA512 592413f0f907ec5c7c6b22366e418c589a653ef105b61bf0f98fc64dc40ccea0d2fadc9af9ade62bffa99cafec6e1305300cb9531202923614fe308b7f831210
HEAD_REF master
PATCHES
00001-fix-uwp.patch

View File

@ -1,7 +1,6 @@
{
"name": "grpc",
"version-semver": "1.48.0",
"port-version": 2,
"version-semver": "1.49.0",
"description": "An RPC library and framework",
"homepage": "https://github.com/grpc/grpc",
"license": "Apache-2.0",

View File

@ -1,8 +1,8 @@
diff --git a/cmake/make_cmakelists.py b/cmake/make_cmakelists.py
index d64c14f..12226cf 100755
index d64c14f6..ad3597c3 100755
--- a/cmake/make_cmakelists.py
+++ b/cmake/make_cmakelists.py
@@ -316,10 +316,132 @@ class Converter(object):
@@ -316,10 +316,136 @@ class Converter(object):
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id")
endif()
@ -104,6 +104,8 @@ index d64c14f..12226cf 100755
+ set_target_properties(json PROPERTIES OUTPUT_NAME upb_json)
+ set_target_properties(utf8_range PROPERTIES OUTPUT_NAME upb_utf8_range)
+ set_target_properties(mini_table PROPERTIES OUTPUT_NAME upb_mini_table)
+ set_target_properties(extension_registry PROPERTIES OUTPUT_NAME upb_extension_registry)
+ set_target_properties(collections PROPERTIES OUTPUT_NAME upb_collections)
+
+ install(
+ DIRECTORY ../upb
@ -127,6 +129,8 @@ index d64c14f..12226cf 100755
+ textformat
+ mini_table_internal
+ mini_table
+ extension_registry
+ collections
+ ${UPB_CODEGEN_TARGETS}
+ EXPORT upb-config
+ )

View File

@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO protocolbuffers/upb
REF bef53686ec702607971bd3ea4d4fefd80c6cc6e8 # 2022-04-04
SHA512 3801625827a5511ab28e047d7111e6f43d522872eef929b61d7a64fdb9fff7a058af45fd55bd409610c07c735f50a2f6f45ad611bb5e4ee86cd656b89f0a8278
REF e4635f223e7d36dfbea3b722a4ca4807a7e882e2 # 2022-06-21
SHA512 c5d48b1d87be7db65ad1f04f5ab43d694958d0e6892fd79c29993e564a402891fcd24ee9d34a9ca642ad20b80c02d3157675885edb6bd3bbc8cf5f29cc3be32c
HEAD_REF master
PATCHES
0001-make-cmakelists-py.patch

View File

@ -1,6 +1,6 @@
{
"name": "upb",
"version-date": "2022-04-04",
"version-date": "2022-06-21",
"description": "μpb (often written 'upb') is a small protobuf implementation written in C.",
"homepage": "https://github.com/protocolbuffers/upb/",
"license": "BSD-2-Clause",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c569c0e44beca0b94d5a2d52a24e3a91868550ae",
"version-string": "20220623.1",
"port-version": 0
},
{
"git-tree": "962a81319706d17c9e90bd0b873659ec7c75178a",
"version-string": "20211102.1",

View File

@ -13,7 +13,7 @@
"port-version": 1
},
"abseil": {
"baseline": "20211102.1",
"baseline": "20220623.1",
"port-version": 0
},
"absent": {
@ -2741,8 +2741,8 @@
"port-version": 0
},
"grpc": {
"baseline": "1.48.0",
"port-version": 2
"baseline": "1.49.0",
"port-version": 0
},
"grppi": {
"baseline": "0.4.0",
@ -7497,7 +7497,7 @@
"port-version": 0
},
"upb": {
"baseline": "2022-04-04",
"baseline": "2022-06-21",
"port-version": 0
},
"urdfdom": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "28334108999e49da12dbde24bcfc183984ecef41",
"version-semver": "1.49.0",
"port-version": 0
},
{
"git-tree": "efed7f493dec5fdebaebdec83c521fc860b432a3",
"version-semver": "1.48.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4a5b5306d38f1a58f65c98c236b84ca297501ab1",
"version-date": "2022-06-21",
"port-version": 0
},
{
"git-tree": "de1d8718e4ea42428b87f4275352c4f3bbb6ac11",
"version-date": "2022-04-04",