[grpc][upb] Update to newer versions (#17422)

* [gRPC] 1.36.4

* [upb] update to 2020-12-19

* update version

* [upb] Fix config.cmake file

* [grpc] Restore using system upb

* [grpc][upb] Version db changes

* [grpc][upb] Fix building upbdefs in grpc

Co-authored-by: Jeong YunWon <jeong@youknowone.org>
Co-authored-by: Jonliu1993 <13720414433@163.com>

5 files changed, 59 insertions, 29 deletions

diff --git a/ports/grpc/00009-use-system-upb.patch b/ports/grpc/00009-use-system-upb.patch
index 1e5f9a721..e927d6d0e 100644
--- a/ports/grpc/00009-use-system-upb.patch
+++ b/ports/grpc/00009-use-system-upb.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt

-index ec1714687e..e15d25097f 100644

+index c848b50605..7822c4f713 100644

 --- a/CMakeLists.txt

 +++ b/CMakeLists.txt

 @@ -84,6 +84,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package")

@@ -12,15 +12,15 @@ index ec1714687e..e15d25097f 100644
  set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package")

  set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE")

  

-@@ -1911,7 +1914,6 @@ target_link_libraries(grpc

+@@ -2037,7 +2040,6 @@ target_link_libraries(grpc

    ${_gRPC_ALLTARGETS_LIBRARIES}

    gpr

    address_sorting

 -  upb

    absl::optional

    absl::strings

-   absl::status

-@@ -1993,7 +1995,6 @@ target_link_libraries(grpc_csharp_ext

+   absl::statusor

+@@ -2122,7 +2124,6 @@ target_link_libraries(grpc_csharp_ext

    grpc

    gpr

    address_sorting

@@ -28,15 +28,15 @@ index ec1714687e..e15d25097f 100644
  )

  

  

-@@ -2463,7 +2464,6 @@ target_link_libraries(grpc_unsecure

+@@ -2590,7 +2591,6 @@ target_link_libraries(grpc_unsecure

    ${_gRPC_ALLTARGETS_LIBRARIES}

    gpr

    address_sorting

 -  upb

    absl::optional

    absl::strings

-   absl::status

-@@ -2661,7 +2661,6 @@ target_link_libraries(grpc++

+   absl::statusor

+@@ -2792,7 +2792,6 @@ target_link_libraries(grpc++

    grpc

    gpr

    address_sorting

@@ -44,7 +44,7 @@ index ec1714687e..e15d25097f 100644
  )

  

  foreach(_hdr

-@@ -2907,7 +2906,6 @@ target_link_libraries(grpc++_alts

+@@ -3040,7 +3039,6 @@ target_link_libraries(grpc++_alts

    grpc

    gpr

    address_sorting

@@ -52,7 +52,7 @@ index ec1714687e..e15d25097f 100644
  )

  

  foreach(_hdr

-@@ -2976,7 +2974,6 @@ target_link_libraries(grpc++_error_details

+@@ -3104,7 +3102,6 @@ target_link_libraries(grpc++_error_details

    grpc

    gpr

    address_sorting

@@ -60,7 +60,7 @@ index ec1714687e..e15d25097f 100644
  )

  

  foreach(_hdr

-@@ -3049,7 +3046,6 @@ target_link_libraries(grpc++_reflection

+@@ -3174,7 +3171,6 @@ target_link_libraries(grpc++_reflection

    grpc

    gpr

    address_sorting

@@ -68,7 +68,7 @@ index ec1714687e..e15d25097f 100644
  )

  

  foreach(_hdr

-@@ -3330,7 +3326,6 @@ target_link_libraries(grpc++_unsecure

+@@ -3454,7 +3450,6 @@ target_link_libraries(grpc++_unsecure

    grpc_unsecure

    gpr

    address_sorting

@@ -76,7 +76,7 @@ index ec1714687e..e15d25097f 100644
  )

  

  foreach(_hdr

-@@ -3648,7 +3643,6 @@ target_link_libraries(grpcpp_channelz

+@@ -3773,7 +3768,6 @@ target_link_libraries(grpcpp_channelz

    grpc

    gpr

    address_sorting

@@ -84,15 +84,15 @@ index ec1714687e..e15d25097f 100644
  )

  

  foreach(_hdr

-@@ -3675,6 +3669,7 @@ endif()

+@@ -3799,6 +3793,7 @@ endif()

  

  endif()

  

 +if (gRPC_UPB_PROVIDER STREQUAL "module")

  add_library(upb

+   third_party/upb/upb/decode_fast.c

    third_party/upb/upb/decode.c

-   third_party/upb/upb/encode.c

-@@ -3726,7 +3721,7 @@ if(gRPC_INSTALL)

+@@ -3857,7 +3852,7 @@ if(gRPC_INSTALL)

    )

  endif()

  

@@ -121,7 +121,7 @@ index f2a0e508c3..ecce7ba300 100644
  # See the License for the specific language governing permissions and

  # limitations under the License.

  

-+set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated")

++set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated")

 +if (gRPC_UPB_PROVIDER STREQUAL "module")

 +

  set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb)

diff --git a/ports/grpc/00010-add-feature-absl-sync.patch b/ports/grpc/00010-add-feature-absl-sync.patch
index 8e49e83bb..508461843 100644
--- a/ports/grpc/00010-add-feature-absl-sync.patch
+++ b/ports/grpc/00010-add-feature-absl-sync.patch
@@ -1,25 +1,25 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt

-index e15d25097f..ae77375eae 100644

+index 7822c4f713..4cb75e6eea 100644

 --- a/CMakeLists.txt

 +++ b/CMakeLists.txt

-@@ -1919,6 +1919,8 @@ target_link_libraries(grpc

-   absl::status

+@@ -2047,6 +2047,8 @@ target_link_libraries(grpc

+   absl::bind_front

    absl::inlined_vector

    absl::flat_hash_set

 +  absl::time

 +  absl::synchronization

+   absl::flat_hash_map

  )

  if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)

-   target_link_libraries(grpc "-framework CoreFoundation")

-@@ -2468,6 +2470,8 @@ target_link_libraries(grpc_unsecure

-   absl::strings

+@@ -2596,6 +2598,8 @@ target_link_libraries(grpc_unsecure

+   absl::statusor

    absl::status

    absl::inlined_vector

 +  absl::time

 +  absl::synchronization

+   absl::flat_hash_map

  )

  if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)

-   target_link_libraries(grpc_unsecure "-framework CoreFoundation")

 diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake

 index 078d495417..b6f50bd14c 100644

 --- a/cmake/abseil-cpp.cmake

diff --git a/ports/grpc/00013-build-upbdefs.patch b/ports/grpc/00013-build-upbdefs.patch
new file mode 100644
index 000000000..9a601ec5a
--- /dev/null
+++ b/ports/grpc/00013-build-upbdefs.patch
@@ -0,0 +1,28 @@
+diff --git a/cmake/upb.cmake b/cmake/upb.cmake
+index 59d6813..1ce8bce 100644
+--- a/cmake/upb.cmake
++++ b/cmake/upb.cmake
+@@ -24,8 +24,21 @@ set(_gRPC_UPB_LIBRARIES upb)
+ 
+ elseif(gRPC_UPB_PROVIDER STREQUAL "package")
+     find_package(upb CONFIG REQUIRED)
+-    set(_gRPC_UPB_LIBRARIES upb::upb)
++    set(_gRPC_UPB_LIBRARIES upb)
+     set(_gRPC_UPB_INCLUDE_DIR)
+-    set(upb ${_gRPC_UPB_LIBRARIES})
++    add_library(upb STATIC
++        ${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c
++        ${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
++    )
++    set_target_properties(upb PROPERTIES OUTPUT_NAME grpc_upbdefs)
++    target_include_directories(upb PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated")
++    target_link_libraries(upb PUBLIC upb::all_libs)
++    if(gRPC_INSTALL)
++        install(TARGETS upb EXPORT gRPCTargets
++            RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
++            LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
++            ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
++        )
++    endif()
+     set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n  find_package(upb CONFIG REQUIRED)\nendif()")
+ endif()
diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
index 8102f4492..249d9ef17 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO grpc/grpc
-    REF 054ff69350dfea1876f388e7cf05f19d5d76bc12 # v1.33.1
-    SHA512 d81c26e996f8a4386a432fc98ba0982c9a15e8cb470eb544f82dc81df5a8f79401343d209f3aa75598fbb8b99cc05dcd2a0e616967d5e0464bed4a4464d7fdc1
+    REF 3e53dbe8213137d2c731ecd4d88ebd2948941d75  # v1.36.4
+    SHA512 c207720a66dae97727e94f2587d6be8e4cb479997cc0815a15f5465ff94f6d0b410523e3fed2dd31385cc9d50ab52dfe39b6095257d6ce9a71184ada6ef0ff7e
     HEAD_REF master
     PATCHES
         00001-fix-uwp.patch
@@ -19,6 +19,7 @@ vcpkg_from_github(
         00011-fix-csharp_plugin.patch
         snprintf.patch
         00012-fix-use-cxx17.patch
+        00013-build-upbdefs.patch
 )
 
 if(TARGET_TRIPLET STREQUAL HOST_TRIPLET)
@@ -37,8 +38,10 @@ else()
     set(cares_CARES_PROVIDER "package")
 endif()
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    absl-sync gRPC_ABSL_SYNC_ENABLE
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        absl-sync gRPC_ABSL_SYNC_ENABLE
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json
index a639cdccb..4ec5a5b96 100644
--- a/ports/grpc/vcpkg.json
+++ b/ports/grpc/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "grpc",
-  "version-string": "1.33.1",
-  "port-version": 3,
+  "version-semver": "1.36.4",
   "description": "An RPC library and framework",
   "homepage": "https://github.com/grpc/grpc",
   "dependencies": [