From 1af1e604cdfa56408782f00c0134b168fecac3c6 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 8 Jul 2021 19:51:32 +0200 Subject: [protozero] update to 1.7.0 (#18842) * update protozero to 1.7.0 * update versions * apply suggestions * version --- ports/protozero/CONTROL | 5 ----- ports/protozero/portfile.cmake | 14 ++++++++------ ports/protozero/vcpkg.json | 9 +++++++++ versions/baseline.json | 2 +- versions/p-/protozero.json | 5 +++++ 5 files changed, 23 insertions(+), 12 deletions(-) delete mode 100644 ports/protozero/CONTROL create mode 100644 ports/protozero/vcpkg.json diff --git a/ports/protozero/CONTROL b/ports/protozero/CONTROL deleted file mode 100644 index c8e140371..000000000 --- a/ports/protozero/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: protozero -Version: 1.6.8 -Homepage: https://github.com/am2222/mapnik-windows/ -Description: Minimalist protocol buffer decoder and encoder in C++ -Build-Depends: protobuf \ No newline at end of file diff --git a/ports/protozero/portfile.cmake b/ports/protozero/portfile.cmake index 55703492d..fda45303c 100644 --- a/ports/protozero/portfile.cmake +++ b/ports/protozero/portfile.cmake @@ -2,18 +2,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapbox/protozero - SHA512 24bab4bf4ff7c67b4f2d8e97919ccde115db4fa476462926102da2f48b4689d6b454df56dbc30754d0e81c37f669535e4b2101033b079ace0f4ea2706447abe1 - REF v1.6.8 + SHA512 d09a34865c535264c52f9c605ccb6f453c357f5e3a7b0dc72b097de288eabc6985a5b81ddbe79c47d0af2d8f74e33bd380fefce47acb15d8d51d5c151d71786b + REF v1.7.0 HEAD_REF master ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF ) - vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug") -file(COPY ${SOURCE_PATH}/include/protozero DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/protozero/vcpkg.json b/ports/protozero/vcpkg.json new file mode 100644 index 000000000..aae619a1e --- /dev/null +++ b/ports/protozero/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "protozero", + "version-semver": "1.7.0", + "description": "Minimalist protocol buffer decoder and encoder in C++", + "homepage": "https://github.com/mapbox/protozero", + "dependencies": [ + "protobuf" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 5764d1ebb..f5c94fe90 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5013,7 +5013,7 @@ "port-version": 0 }, "protozero": { - "baseline": "1.6.8", + "baseline": "1.7.0", "port-version": 0 }, "proxygen": { diff --git a/versions/p-/protozero.json b/versions/p-/protozero.json index d29b98225..d05d0ecf2 100644 --- a/versions/p-/protozero.json +++ b/versions/p-/protozero.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23f6ec11be6bbf623dc7590b128027ccb7f69727", + "version-semver": "1.7.0", + "port-version": 0 + }, { "git-tree": "b064bd3211a8ba5ddfe33a49c84bcfa714d1bf8c", "version-string": "1.6.8", -- cgit v1.2.3