diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index ce595ce0f1e12d..f24002911ccbee 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -1,9 +1,24 @@ +vcpkg_download_distfile(patch4310 + URLS "https://patch-diff.githubusercontent.com/raw/zeromq/libzmq/pull/4310.diff" + FILENAME "zeromq-libzmq-4310.diff" + SHA512 64e6d37ab843e5b9aa9e56ba7904423ce0a2c6b4101dbd86b7b8b22c52c384ed7ea9764f9e0a53be04e7ade09923ca95452104e9760b66ebc0ed3ffef08a75c5 +) + +vcpkg_download_distfile(patch4311 + URLS "https://patch-diff.githubusercontent.com/raw/zeromq/libzmq/pull/4311.diff" + FILENAME "zeromq-libzmq-4311.diff" + SHA512 2b04e0ce4743d27070ea832c45e2d8fa0091c755757937cfa2a2bb43283ee38dc9f27343989e1ad8c45fda8a3cfaa012250b0c581e2f0407938cbb61b2a21e63 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/libzmq REF v4.3.4 SHA512 ad828b1ab5a87983285a6b44b08240816ed1c4e2c73306ab1a851bf80df1892b5e2f92064a49fbadc1f4c75043625ace77dd25b64d5d1c2a7d1d61cc916fba0b - PATCHES fix-arm.patch + PATCHES + fix-arm.patch + ${patch4310} + ${patch4311} ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) @@ -12,8 +27,8 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - sodium WITH_LIBSODIUM - draft ENABLE_DRAFTS + sodium WITH_LIBSODIUM + draft ENABLE_DRAFTS websockets-sha1 ENABLE_WS ) @@ -23,7 +38,7 @@ if(VCPKG_TARGET_IS_MINGW) endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DZMQ_BUILD_TESTS=OFF -DBUILD_STATIC=${BUILD_STATIC} diff --git a/ports/zeromq/vcpkg.json b/ports/zeromq/vcpkg.json index 7c49777350c489..89abe2fd9a76ca 100644 --- a/ports/zeromq/vcpkg.json +++ b/ports/zeromq/vcpkg.json @@ -1,9 +1,10 @@ { "name": "zeromq", "version": "4.3.4", - "port-version": 3, + "port-version": 4, "description": "The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products", "homepage": "https://github.com/zeromq/libzmq", + "license": "LGPL-3.0-only", "supports": "!uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 0e6b08ccacb59b..ac98327a06788e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7502,7 +7502,7 @@ }, "zeromq": { "baseline": "4.3.4", - "port-version": 3 + "port-version": 4 }, "zfp": { "baseline": "0.5.5", diff --git a/versions/z-/zeromq.json b/versions/z-/zeromq.json index 822bd69ccddcfc..fe9da3be4e7333 100644 --- a/versions/z-/zeromq.json +++ b/versions/z-/zeromq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efc9d6229adaef7b036d222004dd786353f8cd4e", + "version": "4.3.4", + "port-version": 4 + }, { "git-tree": "46cd1dcc3bc077341533cc01c32f467d1a7e181f", "version": "4.3.4",