[flatbuffers] upgrade the `flatbuffers` to v2.0.0 (#18897)

* upgrade the flatbuffers's version

* run `vcpkg x-add-version`

* upgrade flatbuffers to v2.0.0 for mnn

* add new port-version of `mnn` after upgrade the flatbuffers

* fix the port-version of `mnn`

* Update ports/mnn/vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* Update ports/flatbuffers/CONTROL

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* run `vcpkg x-add-version flatbuffers --overwrite-version`

* run `vcpkg x-add-version mnn --overwrite-version`

* regenerate code files by flatc before build

* run `vcpkg x-add-version mnn --overwrite-version`

* add `flatbuffers` in dependencies

* run `vcpkg x-add-version mnn --overwrite-version`

* new port version for mnn

* run `vcpkg x-add-version mnn --overwrite-version` to rebuild

* Update versions/m-/mnn.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* Update ports/mnn/vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* run `vcpkg x-add-version mnn --overwrite-version`

* Add missing quotes.

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>

6 files changed, 10 insertions, 36 deletions

diff --git a/ports/flatbuffers/CONTROL b/ports/flatbuffers/CONTROL
index ced25eb94..da211dc0d 100644
--- a/ports/flatbuffers/CONTROL
+++ b/ports/flatbuffers/CONTROL
@@ -1,6 +1,5 @@
 Source: flatbuffers
-Version: 1.12.0
-Port-Version: 2
+Version: 2.0.0
 Description: Memory Efficient Serialization Library
  FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility.
 Homepage:  https://google.github.io/flatbuffers/
diff --git a/ports/flatbuffers/fix-issue-6036.patch b/ports/flatbuffers/fix-issue-6036.patch
deleted file mode 100644
index 872b73e6f..000000000
--- a/ports/flatbuffers/fix-issue-6036.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
-index c4dc5bc..c090455 100644
---- a/include/flatbuffers/flatbuffers.h
-+++ b/include/flatbuffers/flatbuffers.h
-@@ -1861,14 +1861,14 @@ class FlatBufferBuilder {
- 
-   /// @cond FLATBUFFERS_INTERNAL
-   template<typename T> struct TableKeyComparator {
--    TableKeyComparator(vector_downward &buf) : buf_(buf) {}
-+    TableKeyComparator(vector_downward &buf) : buf_(&buf) {}
-     TableKeyComparator(const TableKeyComparator &other) : buf_(other.buf_) {}
-     bool operator()(const Offset<T> &a, const Offset<T> &b) const {
--      auto table_a = reinterpret_cast<T *>(buf_.data_at(a.o));
--      auto table_b = reinterpret_cast<T *>(buf_.data_at(b.o));
-+      auto table_a = reinterpret_cast<T *>(buf_->data_at(a.o));
-+      auto table_b = reinterpret_cast<T *>(buf_->data_at(b.o));
-       return table_a->KeyCompareLessThan(table_b);
-     }
--    vector_downward &buf_;
-+    vector_downward *buf_;
- 
-    private:
-     TableKeyComparator &operator=(const TableKeyComparator &other) {
diff --git a/ports/flatbuffers/fix-uwp-build.patch b/ports/flatbuffers/fix-uwp-build.patch
index 5716f8a2f..44513b9e8 100644
--- a/ports/flatbuffers/fix-uwp-build.patch
+++ b/ports/flatbuffers/fix-uwp-build.patch
@@ -1,8 +1,8 @@
 diff --git a/src/util.cpp b/src/util.cpp
-index c1bb197..658e116 100644
+index 3670a019..fb5d884f 100644
 --- a/src/util.cpp
 +++ b/src/util.cpp
-@@ -245,9 +245,15 @@ bool ReadEnvironmentVariable(const char *var_name, std::string *_value) {
+@@ -255,9 +255,15 @@ bool ReadEnvironmentVariable(const char *var_name, std::string *_value) {
  #ifdef _MSC_VER
    __pragma(warning(disable : 4996));  // _CRT_SECURE_NO_WARNINGS
  #endif
diff --git a/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch b/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch
index 38e1f12ec..8bd99db36 100644
--- a/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch
+++ b/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 119855a..945085a 100644
+index ec782239..f163b64d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -155,7 +155,7 @@ set(FlatBuffers_GRPCTest_SRCS
+@@ -216,7 +216,7 @@ set(FlatBuffers_GRPCTest_SRCS
  # source_group(Compiler FILES ${FlatBuffers_Compiler_SRCS})
  # source_group(Tests FILES ${FlatBuffers_Tests_SRCS})
  
diff --git a/ports/flatbuffers/no-werror.patch b/ports/flatbuffers/no-werror.patch
index b354e229d..dcc5cde41 100644
--- a/ports/flatbuffers/no-werror.patch
+++ b/ports/flatbuffers/no-werror.patch
@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 119855a..6269362 100644
+index ec782239..57566c5a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -172,13 +172,17 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
+@@ -233,13 +233,17 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
        "${CMAKE_CXX_FLAGS} -std=c++0x")
    endif(CYGWIN)
    set(CMAKE_CXX_FLAGS
 -    "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Werror=shadow")
-+	"${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Werror=shadow")
++    "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Werror=shadow")
    set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast")
    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.4)
      if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake
index 794592d98..5cf7ab6bb 100644
--- a/ports/flatbuffers/portfile.cmake
+++ b/ports/flatbuffers/portfile.cmake
@@ -3,15 +3,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/flatbuffers
-    REF v1.12.0
-    SHA512 8a0b88d739fa4694a69d3630140fe89fdd70d50bba4dadd1758d9aa2920cda16700bcafb8d89fe2a09ac907d3f378240c3cb4abc7106318136799836aba4b063
+    REF v2.0.0
+    SHA512 26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89
     HEAD_REF master
     PATCHES
         ignore_use_of_cmake_toolchain_file.patch
         no-werror.patch
         fix-uwp-build.patch
-        fix-issue-6036.patch # this patch is already applied to the latest master branch. 
-                             # remove it in next version update
 )
 
 set(OPTIONS)