From 46aab412e13c3d8f715b2d6a500c42eba2a613bb Mon Sep 17 00:00:00 2001 From: luncliff Date: Tue, 23 Mar 2021 21:00:29 +0900 Subject: [PATCH 1/3] [flatbuffers] exclude 'flatc' for ios triplets * building flatc requires BUNDLE DESTINATION * increase port version --- ports/flatbuffers/CONTROL | 1 + ports/flatbuffers/portfile.cmake | 4 ++-- versions/baseline.json | 2 +- versions/f-/flatbuffers.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/flatbuffers/CONTROL b/ports/flatbuffers/CONTROL index 5433a059877214..0fd42f61c48857 100644 --- a/ports/flatbuffers/CONTROL +++ b/ports/flatbuffers/CONTROL @@ -3,3 +3,4 @@ Version: 1.12.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/ +Port-Version: 1 diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake index 1c3cf665bcd1a9..57cb4e707f0fe4 100644 --- a/ports/flatbuffers/portfile.cmake +++ b/ports/flatbuffers/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_from_github( ) set(OPTIONS) -if(VCPKG_TARGET_IS_UWP) +if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_IOS) list(APPEND OPTIONS -DFLATBUFFERS_BUILD_FLATC=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF) endif() @@ -38,7 +38,7 @@ if(flatc_path) ${flatc_path} ${CURRENT_PACKAGES_DIR}/tools/flatbuffers/${flatc_executable} ) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/flatbuffers) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/flatbuffers) endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/versions/baseline.json b/versions/baseline.json index 94d1c2c6a51269..18b5844ab7c429 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1962,7 +1962,7 @@ }, "flatbuffers": { "baseline": "1.12.0", - "port-version": 0 + "port-version": 1 }, "flint": { "baseline": "2.5.2-4", diff --git a/versions/f-/flatbuffers.json b/versions/f-/flatbuffers.json index ead5fa66607a99..32eba07777a189 100644 --- a/versions/f-/flatbuffers.json +++ b/versions/f-/flatbuffers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c1e770123a0c3407941e993dc2909d7f3303ec5", + "version-string": "1.12.0", + "port-version": 1 + }, { "git-tree": "7a379bb07674796e20d0a52c915d7c7d534674a7", "version-string": "1.12.0", From 67fd5c1a4d69323fe587677a68e879afa53e4204 Mon Sep 17 00:00:00 2001 From: luncliff Date: Wed, 24 Mar 2021 11:03:30 +0900 Subject: [PATCH 2/3] [flatbuffers] increase port version --- ports/flatbuffers/CONTROL | 3 +-- versions/baseline.json | 2 +- versions/f-/flatbuffers.json | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/flatbuffers/CONTROL b/ports/flatbuffers/CONTROL index 4c6df33c7598e4..ced25eb94c3c45 100644 --- a/ports/flatbuffers/CONTROL +++ b/ports/flatbuffers/CONTROL @@ -1,7 +1,6 @@ Source: flatbuffers Version: 1.12.0 -Port-Version: 1 +Port-Version: 2 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/ -Port-Version: 1 diff --git a/versions/baseline.json b/versions/baseline.json index bbbffb6f9ad0c2..b0f211cdc49688 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1966,7 +1966,7 @@ }, "flatbuffers": { "baseline": "1.12.0", - "port-version": 1 + "port-version": 2 }, "flint": { "baseline": "2.5.2-4", diff --git a/versions/f-/flatbuffers.json b/versions/f-/flatbuffers.json index 3bc77236521666..2a6cd53a0168e4 100644 --- a/versions/f-/flatbuffers.json +++ b/versions/f-/flatbuffers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5123e2688e371799395a11c1b16709658a1862f6", + "version-string": "1.12.0", + "port-version": 2 + }, { "git-tree": "cb19f0b4ccf3b910c2dab457cfb05f190ae092b3", "version-string": "1.12.0", From 76af108cf1a5c484986eeac4e4b1661db7ed812b Mon Sep 17 00:00:00 2001 From: luncliff Date: Wed, 24 Mar 2021 11:19:37 +0900 Subject: [PATCH 3/3] [flatbuffers] fix git-tree SHA --- versions/f-/flatbuffers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/flatbuffers.json b/versions/f-/flatbuffers.json index 2a6cd53a0168e4..106b1d8cadd09b 100644 --- a/versions/f-/flatbuffers.json +++ b/versions/f-/flatbuffers.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5123e2688e371799395a11c1b16709658a1862f6", + "git-tree": "195ffbf0b3c6abace9106115fd4ed081431a3997", "version-string": "1.12.0", "port-version": 2 },