diff options
| author | Park DongHa <dong-ha-park@linecorp.com> | 2021-03-24 06:38:59 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-23 14:38:59 -0700 |
| commit | b35f1edc231f158a5d7f8b8df3b7d01e3c27eb0c (patch) | |
| tree | a36b74fbd49c26264b09632476046d7a09b03611 /ports/flatbuffers | |
| parent | e1e3d81a593d23c32aeefbbce73036844c91a198 (diff) | |
| download | vcpkg-b35f1edc231f158a5d7f8b8df3b7d01e3c27eb0c.tar.gz vcpkg-b35f1edc231f158a5d7f8b8df3b7d01e3c27eb0c.zip | |
[mnn,flatbuffers] add a new port and patch (#15717)
* [mnn] add a new port
* create a patch, embed copyright
* touching install options
* [mnn] fix windows install
* feature cuda reqires cudnn
* [flatbuffers] add patch for TableKeyComparator
* update port SHA
* [mnn] disable arm support
* [mnn] update port SHA
* patch creates version config.cmake
* run vcpkg_copy_tools for 'tools' feature
* [mnn] remove bin when non-Windows
* make PREFER_NINJA optional for 'cuda' feature
* [mnn] fix wrong macro
* [mnn] rename install path to lowercase
* [mnn] make 'metal' feature optional
* update port SHA
* [mnn] apply PR feedback
* Move build options into vcpkg_check_features
* Download Apache-2.0 licence instead of local file
* [mnn] remove code patch for Windows
* this will break `mnn[tools]` for `windows` triplet
* [mnn] remove code changes in the patch
* [mnn] remove version.cmake generation
* possibly break osx build with the chnage
* Update ports/mnn/portfile.cmake
* Update versions/m-/mnn.json
* [mnn] apply PR feedback
* find_package(CUDNN) in patch
* use vcpkg_download_distfile
* ONLY_STATIC_LIBRARY for Windows
* [mnn] create share folder and move copyright
* [mnn] update git-tree SHA
* Update ports/mnn/portfile.cmake
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* [mnn] update git-tree SHA
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/flatbuffers')
| -rw-r--r-- | ports/flatbuffers/CONTROL | 1 | ||||
| -rw-r--r-- | ports/flatbuffers/fix-issue-6036.patch | 23 | ||||
| -rw-r--r-- | ports/flatbuffers/portfile.cmake | 4 |
3 files changed, 27 insertions, 1 deletions
diff --git a/ports/flatbuffers/CONTROL b/ports/flatbuffers/CONTROL index 5433a0598..8f565b25f 100644 --- a/ports/flatbuffers/CONTROL +++ b/ports/flatbuffers/CONTROL @@ -1,5 +1,6 @@ Source: flatbuffers Version: 1.12.0 +Port-Version: 1 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 new file mode 100644 index 000000000..872b73e6f --- /dev/null +++ b/ports/flatbuffers/fix-issue-6036.patch @@ -0,0 +1,23 @@ +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/portfile.cmake b/ports/flatbuffers/portfile.cmake index 1c3cf665b..1a3c6f835 100644 --- a/ports/flatbuffers/portfile.cmake +++ b/ports/flatbuffers/portfile.cmake @@ -9,7 +9,9 @@ vcpkg_from_github( PATCHES ignore_use_of_cmake_toolchain_file.patch no-werror.patch - fix-uwp-build.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) |